README update

fixed conflicts
ready to become the master
2015-09-18 10:40:21 -07:00 · 2015-09-14 09:56:30 -07:00 · 2015-09-14 09:49:33 -07:00 · 2015-09-14 09:47:31 -07:00 · 2015-09-14 09:32:49 -07:00 · 2015-09-14 09:26:01 -07:00
29 changed files with 1681 additions and 302 deletions
@@ -8,7 +8,7 @@

 # Xcode
 .DS_Store
-build/
+build
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -1,9 +1,10 @@
-![starscream](http://limitedtoy.com/wp-content/uploads/2014/09/transformers-starscream-wallpaperstarscream-transformers-2-wallpaper---332913-pnx7lnff.jpg)
+![starscream](https://raw.githubusercontent.com/daltoniam/starscream/assets/starscream.jpg)

 Starscream is a conforming WebSocket ([RFC 6455](http://tools.ietf.org/html/rfc6455)) client library in Swift for iOS and OSX.

 It's Objective-C counter part can be found here: [Jetfire](https://github.com/acmacalister/jetfire)

+This is written Swift 2.0 (the latest). If you need older legecy support checkout the Swift-1.2 branch [here](https://github.com/daltoniam/Starscream/tree/swift-1.2).

 ## Features

@@ -18,16 +19,13 @@ It's Objective-C counter part can be found here: [Jetfire](https://github.com/ac
 First thing is to import the framework. See the Installation instructions on how to add the framework to your project.

 ```swift
-//iOS
 import Starscream
-//OS X
-import StarscreamOSX
 ```

 Once imported, you can open a connection to your WebSocket server. Note that `socket` is probably best as a property, so your delegate can stick around.

 ```swift
-var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"))
+var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!)
 socket.delegate = self
 socket.connect()
 ```
@@ -50,7 +48,7 @@ websocketDidDisconnect is called as soon as the client is disconnected from the

 ```swift
 func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
-	println("websocket is disconnected: \(error!.localizedDescription)")
+	println("websocket is disconnected: \(error?.localizedDescription)")
 }
 ```

@@ -74,7 +72,42 @@ func websocketDidReceiveData(socket: WebSocket, data: NSData) {
 }
 ```

-The delegate methods give you a simple way to handle data from the server, but how do you send data?
+### Optional: websocketDidReceivePong *(required protocol: WebSocketPongDelegate)*
+
+websocketDidReceivePong is called when the client gets a pong response from the connection. You need to implement the WebSocketPongDelegate protocol and set an additional delegate, eg: ` socket.pongDelegate = self`
+
+```swift
+func websocketDidReceivePong(socket: WebSocket) {
+	println("Got pong!")
+}
+```
+
+Or you can use closures.
+
+```swift
+var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!)
+//websocketDidConnect
+socket.onConnect = {
+    println("websocket is connected")
+}
+//websocketDidDisconnect
+socket.onDisconnect = { (error: NSError?) in
+    println("websocket is disconnected: \(error?.localizedDescription)")
+}
+//websocketDidReceiveMessage
+socket.onText = { (text: String) in
+    println("got some text: \(text)")
+}
+//websocketDidReceiveData
+socket.onData = { (data: NSData) in
+    println("got some data: \(data.length)")
+}
+//you could do onPong as well.
+socket.connect()
+```
+
+
+## The delegate methods give you a simple way to handle data from the server, but how do you send data?

 ### writeData

@@ -92,6 +125,14 @@ The writeString method is the same as writeData, but sends text/string.
 self.socket.writeString("Hi Server!") //example on how to write text over the socket!
 ```

+### writePing
+
+The writePing method is the same as writeData, but sends a ping control frame.
+
+```swift
+self.socket.writePing(NSData()) //example on how to write a ping control frame over the socket!
+```
+
 ### disconnect

 The disconnect method does what you would expect and closes the socket.
@@ -126,7 +167,7 @@ If you need to specify a protocol, simple add it to the init:

 ```swift
 //chat and superchat are the example protocols here
-var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"), protocols: ["chat","superchat"])
+var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!, protocols: ["chat","superchat"])
 socket.delegate = self
 socket.connect()
 ```
@@ -136,7 +177,7 @@ socket.connect()
 There are a couple of other properties that modify the stream:

 ```swift
-var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"), protocols: ["chat","superchat"])
+var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!, protocols: ["chat","superchat"])

 //set this if you are planning on using the socket in a VOIP background setting (using the background VOIP service).
 socket.voipEnabled = true
@@ -145,6 +186,28 @@ socket.voipEnabled = true
 socket.selfSignedSSL = true
 ```

+### SSL Pinning
+
+SSL Pinning is also supported in Starscream. 
+
+```swift
+var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!, protocols: ["chat","superchat"])
+let data = ... //load your certificate from disk
+socket.security = Security(certs: [SSLCert(data: data)], usePublicKeys: true)
+//socket.security = Security() //uses the .cer files in your app's bundle
+```
+You load either a `NSData` blob of your certificate or you can use a `SecKeyRef` if you have a public key you want to use. The `usePublicKeys` bool is whether to use the certificates for validation or the public keys. The public keys will be extracted from the certificates automatically if `usePublicKeys` is choosen.
+
+### Custom Queue
+
+A custom queue can be specified when delegate methods are called. By default `dispatch_get_main_queue` is used, thus making all delegate methods calls run on the main thread. It is important to note that all WebSocket processing is done on a background thread, only the delegate method calls are changed when modifying the queue. The actual processing is always on a background thread and will not pause your app.
+
+```swift
+var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!, protocols: ["chat","superchat"])
+//create a custom queue
+socket.queue = dispatch_queue_create("com.vluxe.starscream.myapp", nil)
+```
+
 ## Example Project

 Check out the SimpleTest project in the examples directory to see how to setup a simple connection to a WebSocket server.
@@ -155,54 +218,41 @@ Starscream works with iOS 7/OSX 10.9 or above. It is recommended to use iOS 8/10

 ## Installation

-### [CocoaPods](http://cocoapods.org/)
-At this time, Cocoapods support for Swift frameworks is supported in a [pre-release](http://blog.cocoapods.org/Pod-Authors-Guide-to-CocoaPods-Frameworks/).
+### Cocoapods
+
+Check out [Get Started](http://cocoapods.org/) tab on [cocoapods.org](http://cocoapods.org/).

 To use Starscream in your project add the following 'Podfile' to your project

-    source 'https://github.com/CocoaPods/Specs.git'
+	source 'https://github.com/CocoaPods/Specs.git'
+	platform :ios, '8.0'
+	use_frameworks!

-    xcodeproj 'YourProjectName.xcodeproj'
-    platform :ios, '8.0'
-
-    pod 'Starscream', :git => "https://github.com/daltoniam/starscream.git", :tag => "0.9.1"
-
-    target 'YourProjectNameTests' do
-        pod 'Starscream', :git => "https://github.com/daltoniam/starscream.git", :tag => "0.9.1"
-    end
+	pod 'Starscream', '~> 1.0.0'

 Then run:

    pod install

-#### Updating the Cocoapod
-You can validate Starscream.podspec using:
-
-    pod spec lint Starscream.podspec
-
-This should be tested with a sample project before releasing it. This can be done by adding the following line to a ```Podfile```:
-
-    pod 'Starscream', :git => 'https://github.com/username/starscream.git'
-
-Then run:
-
-    pod install
-
-If all goes well you are ready to release. First, create a tag and push:
-
-    git tag 'version'
-    git push --tags
-
-Once the tag is available you can send the library to the Specs repo. For this you'll have to follow the instructions in [Getting Setup with Trunk](http://guides.cocoapods.org/making/getting-setup-with-trunk.html).
-
-    pod trunk push Starscream.podspec
-
 ### Carthage

 Check out the [Carthage](https://github.com/Carthage/Carthage) docs on how to add a install. The `Starscream` framework is already setup with shared schemes.

 [Carthage Install](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application)

+You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+To integrate Starscream into your Xcode project using Carthage, specify it in your `Cartfile`:
+
+```
+github "daltoniam/Starscream" >= 1.0.0
+```
+
 ### Rogue

 First see the [installation docs](https://github.com/acmacalister/Rogue) for how to install Rogue.
@@ -223,11 +273,12 @@ Add the `Starscream.xcodeproj` to your Xcode project. Once that is complete, in

 ### Add Copy Frameworks Phase

-If you are running this in an OSX app or on a physical iOS device you will need to make sure you add the `Starscream.framework` or `StarscreamOSX.framework` to be included in your app bundle. To do this, in Xcode, navigate to the target configuration window by clicking on the blue project icon, and selecting the application target under the "Targets" heading in the sidebar. In the tab bar at the top of that window, open the "Build Phases" panel. Expand the "Link Binary with Libraries" group, and add `Starscream.framework` or `StarscreamOSX.framework` depending on if you are building an iOS or OSX app. Click on the + button at the top left of the panel and select "New Copy Files Phase". Rename this new phase to "Copy Frameworks", set the "Destination" to "Frameworks", and add `Starscream.framework` or `StarscreamOSX.framework` respectively.
+If you are running this in an OSX app or on a physical iOS device you will need to make sure you add the `Starscream.framework` to be included in your app bundle. To do this, in Xcode, navigate to the target configuration window by clicking on the blue project icon, and selecting the application target under the "Targets" heading in the sidebar. In the tab bar at the top of that window, open the "Build Phases" panel. Expand the "Link Binary with Libraries" group, and add `Starscream.framework`. Click on the + button at the top left of the panel and select "New Copy Files Phase". Rename this new phase to "Copy Frameworks", set the "Destination" to "Frameworks", and add `Starscream.framework` respectively.

 ## TODOs

- [ ] Complete Docs
+- [ ] WatchOS
+- [ ] TVOS?
 - [ ] Add Unit Tests

 ## License
@@ -0,0 +1,242 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  SSLSecurity.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 5/16/15.
+//  Copyright (c) 2015 Vluxe. All rights reserved.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+import Foundation
+import Security
+
+public class SSLCert {
+    var certData: NSData?
+    var key: SecKeyRef?
+    
+    /**
+    Designated init for certificates
+    
+    - parameter data: is the binary data of the certificate
+    
+    - returns: a representation security object to be used with
+    */
+    public init(data: NSData) {
+        self.certData = data
+    }
+    
+    /**
+    Designated init for public keys
+    
+    - parameter key: is the public key to be used
+    
+    - returns: a representation security object to be used with
+    */
+    public init(key: SecKeyRef) {
+        self.key = key
+    }
+}
+
+public class SSLSecurity {
+    public var validatedDN = true //should the domain name be validated?
+    
+    var isReady = false //is the key processing done?
+    var certificates: [NSData]? //the certificates
+    var pubKeys: [SecKeyRef]? //the public keys
+    var usePublicKeys = false //use public keys or certificate validation?
+    
+    /**
+    Use certs from main app bundle
+    
+    - parameter usePublicKeys: is to specific if the publicKeys or certificates should be used for SSL pinning validation
+    
+    - returns: a representation security object to be used with
+    */
+    public convenience init(usePublicKeys: Bool = false) {
+        let paths = NSBundle.mainBundle().pathsForResourcesOfType("cer", inDirectory: ".")
+        var collect = Array<SSLCert>()
+        for path in paths {
+            if let d = NSData(contentsOfFile: path as String) {
+                collect.append(SSLCert(data: d))
+            }
+        }
+        self.init(certs:collect, usePublicKeys: usePublicKeys)
+    }
+    
+    /**
+    Designated init
+    
+    - parameter keys: is the certificates or public keys to use
+    - parameter usePublicKeys: is to specific if the publicKeys or certificates should be used for SSL pinning validation
+    
+    - returns: a representation security object to be used with
+    */
+    public init(certs: [SSLCert], usePublicKeys: Bool) {
+        self.usePublicKeys = usePublicKeys
+        
+        if self.usePublicKeys {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), {
+                var collect = Array<SecKeyRef>()
+                for cert in certs {
+                    if let data = cert.certData where cert.key == nil  {
+                        cert.key = self.extractPublicKey(data)
+                    }
+                    if let k = cert.key {
+                        collect.append(k)
+                    }
+                }
+                self.pubKeys = collect
+                self.isReady = true
+            })
+        } else {
+            var collect = Array<NSData>()
+            for cert in certs {
+                if let d = cert.certData {
+                    collect.append(d)
+                }
+            }
+            self.certificates = collect
+            self.isReady = true
+        }
+    }
+    
+    /**
+    Valid the trust and domain name.
+    
+    - parameter trust: is the serverTrust to validate
+    - parameter domain: is the CN domain to validate
+    
+    - returns: if the key was successfully validated
+    */
+    public func isValid(trust: SecTrustRef, domain: String?) -> Bool {
+        
+        var tries = 0
+        while(!self.isReady) {
+            usleep(1000)
+            tries += 1
+            if tries > 5 {
+                return false //doesn't appear it is going to ever be ready...
+            }
+        }
+        var policy: SecPolicyRef
+        if self.validatedDN {
+            policy = SecPolicyCreateSSL(true, domain)
+        } else {
+            policy = SecPolicyCreateBasicX509()
+        }
+        SecTrustSetPolicies(trust,policy)
+        if self.usePublicKeys {
+            if let keys = self.pubKeys {
+                var trustedCount = 0
+                let serverPubKeys = publicKeyChainForTrust(trust)
+                for serverKey in serverPubKeys as [AnyObject] {
+                    for key in keys as [AnyObject] {
+                        if serverKey.isEqual(key) {
+                            trustedCount++
+                            break
+                        }
+                    }
+                }
+                if trustedCount == serverPubKeys.count {
+                    return true
+                }
+            }
+        } else if let certs = self.certificates {
+            let serverCerts = certificateChainForTrust(trust)
+            var collect = Array<SecCertificate>()
+            for cert in certs {
+                collect.append(SecCertificateCreateWithData(nil,cert)!)
+            }
+            SecTrustSetAnchorCertificates(trust,collect)
+            var result: SecTrustResultType = 0
+            SecTrustEvaluate(trust,&result)
+            let r = Int(result)
+            if r == kSecTrustResultUnspecified || r == kSecTrustResultProceed {
+                var trustedCount = 0
+                for serverCert in serverCerts {
+                    for cert in certs {
+                        if cert == serverCert {
+                            trustedCount++
+                            break
+                        }
+                    }
+                }
+                if trustedCount == serverCerts.count {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+    
+    /**
+    Get the public key from a certificate data
+    
+    - parameter data: is the certificate to pull the public key from
+    
+    - returns: a public key
+    */
+    func extractPublicKey(data: NSData) -> SecKeyRef? {
+        let possibleCert = SecCertificateCreateWithData(nil,data)
+        if let cert = possibleCert {
+            return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509())
+        }
+        return nil
+    }
+    
+    /**
+    Get the public key from a certificate
+    
+    - parameter data: is the certificate to pull the public key from
+    
+    - returns: a public key
+    */
+    func extractPublicKeyFromCert(cert: SecCertificate, policy: SecPolicy) -> SecKeyRef? {
+        var possibleTrust: SecTrust?
+        SecTrustCreateWithCertificates(cert, policy, &possibleTrust)
+        if let trust = possibleTrust {
+            var result: SecTrustResultType = 0
+            SecTrustEvaluate(trust, &result)
+            return SecTrustCopyPublicKey(trust)
+        }
+        return nil
+    }
+    
+    /**
+    Get the certificate chain for the trust
+    
+    - parameter trust: is the trust to lookup the certificate chain for
+    
+    - returns: the certificate chain for the trust
+    */
+    func certificateChainForTrust(trust: SecTrustRef) -> Array<NSData> {
+        var collect = Array<NSData>()
+        for var i = 0; i < SecTrustGetCertificateCount(trust); i++ {
+            let cert = SecTrustGetCertificateAtIndex(trust,i)
+            collect.append(SecCertificateCopyData(cert!))
+        }
+        return collect
+    }
+    
+    /**
+    Get the public key chain for the trust
+    
+    - parameter trust: is the trust to lookup the certificate chain and extract the public keys
+    
+    - returns: the public keys from the certifcate chain for the trust
+    */
+    func publicKeyChainForTrust(trust: SecTrustRef) -> Array<SecKeyRef> {
+        var collect = Array<SecKeyRef>()
+        let policy = SecPolicyCreateBasicX509()
+        for var i = 0; i < SecTrustGetCertificateCount(trust); i++ {
+            let cert = SecTrustGetCertificateAtIndex(trust,i)
+            if let key = extractPublicKeyFromCert(cert!, policy: policy) {
+                collect.append(key)
+            }
+        }
+        return collect
+    }
+    
+    
+}
@@ -6,13 +6,7 @@
 //  Copyright (c) 2014 Vluxe. All rights reserved.
 //

-#import <TargetConditionals.h>
-
-#ifdef TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-#import <UIKit/UIKit.h>
-#else
-#import <Cocoa/Cocoa.h>
-#endif
+#import <Foundation/Foundation.h>

 //! Project version number for Starscream.
 FOUNDATION_EXPORT double StarscreamVersionNumber;
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "Starscream"
-  s.version      = "0.9.2"
+  s.version      = "1.0.0"
  s.summary      = "A conforming WebSocket RFC 6455 client library in Swift for iOS and OSX."
  s.homepage     = "https://github.com/daltoniam/Starscream"
  s.license      = 'Apache License, Version 2.0'
@@ -7,10 +7,12 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		5C06AE8F1B08050D00D41060 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C06AE8E1B08050D00D41060 /* SSLSecurity.swift */; };
+		5C06AE901B08050D00D41060 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C06AE8E1B08050D00D41060 /* SSLSecurity.swift */; };
 		6B3E7A0319D48C2F006071F7 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
 		6B3E7A0519D48C41006071F7 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0419D48C41006071F7 /* WebSocket.swift */; };
 		6B3E7A0719D48C5F006071F7 /* Starscream.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3E7A0619D48C5F006071F7 /* Starscream.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D9C3E36A19E48FF1009FC285 /* StarscreamOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9C3E35F19E48FF1009FC285 /* StarscreamOSX.framework */; };
+		D9C3E36A19E48FF1009FC285 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9C3E35F19E48FF1009FC285 /* Starscream.framework */; };
 		D9C3E37819E4903F009FC285 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
 		D9C3E37919E49051009FC285 /* Starscream.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3E7A0619D48C5F006071F7 /* Starscream.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D9C3E37A19E49058009FC285 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0419D48C41006071F7 /* WebSocket.swift */; };
@@ -27,6 +29,7 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
+		5C06AE8E1B08050D00D41060 /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSLSecurity.swift; sourceTree = SOURCE_ROOT; };
 		6B3E79E619D48B7F006071F7 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6B3E79EA19D48B7F006071F7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -34,7 +37,7 @@
 		6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StarscreamTests.swift; sourceTree = "<group>"; };
 		6B3E7A0419D48C41006071F7 /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = SOURCE_ROOT; };
 		6B3E7A0619D48C5F006071F7 /* Starscream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Starscream.h; sourceTree = SOURCE_ROOT; };
-		D9C3E35F19E48FF1009FC285 /* StarscreamOSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = StarscreamOSX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D9C3E35F19E48FF1009FC285 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

@@ -64,7 +67,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D9C3E36A19E48FF1009FC285 /* StarscreamOSX.framework in Frameworks */,
+				D9C3E36A19E48FF1009FC285 /* Starscream.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,7 +88,7 @@
 			children = (
 				6B3E79E619D48B7F006071F7 /* Starscream.framework */,
 				6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */,
-				D9C3E35F19E48FF1009FC285 /* StarscreamOSX.framework */,
+				D9C3E35F19E48FF1009FC285 /* Starscream.framework */,
 				D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */,
 			);
 			name = Products;
@@ -95,6 +98,7 @@
 			isa = PBXGroup;
 			children = (
 				6B3E7A0419D48C41006071F7 /* WebSocket.swift */,
+				5C06AE8E1B08050D00D41060 /* SSLSecurity.swift */,
 				6B3E7A0619D48C5F006071F7 /* Starscream.h */,
 				6B3E79E919D48B7F006071F7 /* Supporting Files */,
 			);
@@ -190,7 +194,7 @@
 			);
 			name = StarscreamOSX;
 			productName = StarscreamOSX;
-			productReference = D9C3E35F19E48FF1009FC285 /* StarscreamOSX.framework */;
+			productReference = D9C3E35F19E48FF1009FC285 /* Starscream.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		D9C3E36819E48FF1009FC285 /* StarscreamOSXTests */ = {
@@ -217,7 +221,8 @@
 		6B3E79DD19D48B7F006071F7 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Vluxe;
 				TargetAttributes = {
 					6B3E79E519D48B7F006071F7 = {
@@ -291,6 +296,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6B3E7A0519D48C41006071F7 /* WebSocket.swift in Sources */,
+				5C06AE8F1B08050D00D41060 /* SSLSecurity.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -307,6 +313,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D9C3E37A19E49058009FC285 /* WebSocket.swift in Sources */,
+				5C06AE901B08050D00D41060 /* SSLSecurity.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -350,6 +357,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -429,6 +437,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
@@ -451,6 +460,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
@@ -470,6 +480,7 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -483,6 +494,7 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -504,9 +516,11 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = Starscream;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
@@ -524,9 +538,11 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = Starscream;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};
@@ -545,6 +561,7 @@
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -562,6 +579,7 @@
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -23,21 +23,24 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </TestAction>
   <LaunchAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -52,10 +55,10 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
+      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-               BuildableName = "StarscreamOSX.framework"
+               BuildableName = "Starscream.framework"
               BlueprintName = "StarscreamOSX"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
@@ -37,10 +37,10 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -57,26 +57,29 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-            BuildableName = "StarscreamOSX.framework"
+            BuildableName = "Starscream.framework"
            BlueprintName = "StarscreamOSX"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </TestAction>
   <LaunchAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-            BuildableName = "StarscreamOSX.framework"
+            BuildableName = "Starscream.framework"
            BlueprintName = "StarscreamOSX"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
@@ -85,16 +88,16 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
+      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-            BuildableName = "StarscreamOSX.framework"
+            BuildableName = "Starscream.framework"
            BlueprintName = "StarscreamOSX"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -48,15 +48,18 @@
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </TestAction>
   <LaunchAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -71,10 +74,10 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
+      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -16,6 +16,10 @@ public protocol WebSocketDelegate: class {
    func websocketDidReceiveData(socket: WebSocket, data: NSData)
 }

+public protocol WebSocketPongDelegate: class {
+    func websocketDidReceivePong(socket: WebSocket)
+}
+
 public class WebSocket : NSObject, NSStreamDelegate {
    
    enum OpCode : UInt8 {
@@ -41,6 +45,15 @@ public class WebSocket : NSObject, NSStreamDelegate {
        case PolicyViolated         = 1008
        case MessageTooBig          = 1009
    }
+
+    enum InternalErrorCode : UInt16 {
+        // 0-999 WebSocket status codes not used
+        case OutputStreamWriteError  = 1
+    }
+
+    //Where the callback is executed. It defaults to the main UI thread queue.
+    public var queue            = dispatch_get_main_queue()
+
    var optionalProtocols       : Array<String>?
    //Constant Values.
    let headerWSUpgradeName     = "Upgrade"
@@ -54,7 +67,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
    let headerWSKeyName         = "Sec-WebSocket-Key"
    let headerOriginName        = "Origin"
    let headerWSAcceptName      = "Sec-WebSocket-Accept"
-    let BUFFER_MAX              = 2048
+    let BUFFER_MAX              = 4096
    let FinMask: UInt8          = 0x80
    let OpCodeMask: UInt8       = 0x0F
    let RSVMask: UInt8          = 0x70
@@ -71,62 +84,55 @@ public class WebSocket : NSObject, NSStreamDelegate {
    }
    
    public weak var delegate: WebSocketDelegate?
+    public weak var pongDelegate: WebSocketPongDelegate?
+    public var onConnect: ((Void) -> Void)?
+    public var onDisconnect: ((NSError?) -> Void)?
+    public var onText: ((String) -> Void)?
+    public var onData: ((NSData) -> Void)?
+    public var onPong: ((Void) -> Void)?
+    public var headers = Dictionary<String,String>()
+    public var voipEnabled = false
+    public var selfSignedSSL = false
+    public var security: SSLSecurity?
+    public var isConnected :Bool {
+        return connected
+    }
    private var url: NSURL
    private var inputStream: NSInputStream?
    private var outputStream: NSOutputStream?
    private var isRunLoop = false
    private var connected = false
-    private var writeQueue: NSOperationQueue?
+    private var isCreated = false
+    private var writeQueue = NSOperationQueue()
    private var readStack = Array<WSResponse>()
    private var inputQueue = Array<NSData>()
    private var fragBuffer: NSData?
-    public var headers = Dictionary<String,String>()
-    public var voipEnabled = false
-    public var selfSignedSSL = false
-    private var connectedBlock: ((Void) -> Void)? = nil
-    private var disconnectedBlock: ((NSError?) -> Void)? = nil
-    private var receivedTextBlock: ((String) -> Void)? = nil
-    private var receivedDataBlock: ((NSData) -> Void)? = nil
-    public var isConnected :Bool {
-        return connected
-    }
+    private var certValidated = false
+    private var didDisconnect = false
    
    //init the websocket with a url
    public init(url: NSURL) {
        self.url = url
+        writeQueue.maxConcurrentOperationCount = 1
    }
    //used for setting protocols.
    public convenience init(url: NSURL, protocols: Array<String>) {
        self.init(url: url)
        optionalProtocols = protocols
    }
-    //closure based instead of the delegate
-    public convenience init(url: NSURL, protocols: Array<String>, connect:((Void) -> Void), disconnect:((NSError?) -> Void), text:((String) -> Void), data:(NSData) -> Void) {
-        self.init(url: url, protocols: protocols)
-        connectedBlock = connect
-        disconnectedBlock = disconnect
-        receivedTextBlock = text
-        receivedDataBlock = data
-    }
-    //same as above, just shorter
-    public convenience init(url: NSURL, connect:((Void) -> Void), disconnect:((NSError?) -> Void), text:((String) -> Void)) {
-        self.init(url: url)
-        connectedBlock = connect
-        disconnectedBlock = disconnect
-        receivedTextBlock = text
-    }
-    //same as above, just shorter
-    public convenience init(url: NSURL, connect:((Void) -> Void), disconnect:((NSError?) -> Void), data:((NSData) -> Void)) {
-        self.init(url: url)
-        connectedBlock = connect
-        disconnectedBlock = disconnect
-        receivedDataBlock = data
-    }
-
+    
    ///Connect to the websocket server on a background thread
    public func connect() {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), {
-            self.createHTTPRequest()
+        if isCreated {
+            return
+        }
+        dispatch_async(queue,{ [weak self] in
+            self?.didDisconnect = false
+        })
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), { [weak self] in
+            self?.isCreated = true
+            self?.createHTTPRequest()
+            self?.isCreated = false
        })
    }
    
@@ -144,14 +150,19 @@ public class WebSocket : NSObject, NSStreamDelegate {
    public func writeData(data: NSData) {
        dequeueWrite(data, code: .BinaryFrame)
    }
+    
+    //write a   ping   to the websocket. This sends it as a  control frame.
+    //yodel a   sound  to the planet.    This sends it as an astroid. http://youtu.be/Eu5ZJELRiJ8?t=42s
+    public func writePing(data: NSData) {
+        dequeueWrite(data, code: .Ping)
+    }
    //private methods below!
    
    //private method that starts the connection
    private func createHTTPRequest() {
        
-        let str: NSString = url.absoluteString!
        let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET",
-            url, kCFHTTPVersion1_1)
+            url, kCFHTTPVersion1_1).takeRetainedValue()
        
        var port = url.port
        if port == nil {
@@ -161,27 +172,28 @@ public class WebSocket : NSObject, NSStreamDelegate {
                port = 80
            }
        }
-        self.addHeader(urlRequest, key: headerWSUpgradeName, val: headerWSUpgradeValue)
-        self.addHeader(urlRequest, key: headerWSConnectionName, val: headerWSConnectionValue)
+        addHeader(urlRequest, key: headerWSUpgradeName, val: headerWSUpgradeValue)
+        addHeader(urlRequest, key: headerWSConnectionName, val: headerWSConnectionValue)
        if let protocols = optionalProtocols {
-            self.addHeader(urlRequest, key: headerWSProtocolName, val: ",".join(protocols))
+            addHeader(urlRequest, key: headerWSProtocolName, val: protocols.joinWithSeparator(","))
        }
-        self.addHeader(urlRequest, key: headerWSVersionName, val: headerWSVersionValue)
-        self.addHeader(urlRequest, key: headerWSKeyName, val: self.generateWebSocketKey())
-        self.addHeader(urlRequest, key: headerOriginName, val: url.absoluteString!)
-        self.addHeader(urlRequest, key: headerWSHostName, val: "\(url.host!):\(port!)")
+        addHeader(urlRequest, key: headerWSVersionName, val: headerWSVersionValue)
+        addHeader(urlRequest, key: headerWSKeyName, val: generateWebSocketKey())
+        addHeader(urlRequest, key: headerOriginName, val: url.absoluteString)
+        addHeader(urlRequest, key: headerWSHostName, val: "\(url.host!):\(port!)")
        for (key,value) in headers {
-            self.addHeader(urlRequest, key: key, val: value)
+            addHeader(urlRequest, key: key, val: value)
+        }
+        if let cfHTTPMessage = CFHTTPMessageCopySerializedMessage(urlRequest) {
+            let serializedRequest = cfHTTPMessage.takeRetainedValue()
+            initStreamsWithData(serializedRequest, Int(port!))
        }
-        
-        let serializedRequest: NSData = CFHTTPMessageCopySerializedMessage(urlRequest.takeUnretainedValue()).takeUnretainedValue()
-        self.initStreamsWithData(serializedRequest, Int(port!))
    }
    //Add a header to the CFHTTPMessage by using the NSString bridges to CFString
-    private func addHeader(urlRequest: Unmanaged<CFHTTPMessage>,key: String, val: String) {
+    private func addHeader(urlRequest: CFHTTPMessage,key: String, val: String) {
        let nsKey: NSString = key
        let nsVal: NSString = val
-        CFHTTPMessageSetHeaderFieldValue(urlRequest.takeUnretainedValue(),
+        CFHTTPMessageSetHeaderFieldValue(urlRequest,
            nsKey,
            nsVal)
    }
@@ -193,8 +205,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
            let uni = UnicodeScalar(UInt32(97 + arc4random_uniform(25)))
            key += "\(Character(uni))"
        }
-        var data = key.dataUsingEncoding(NSUTF8StringEncoding)
-        var baseKey = data?.base64EncodedStringWithOptions(NSDataBase64EncodingOptions(0))
+        let data = key.dataUsingEncoding(NSUTF8StringEncoding)
+        let baseKey = data?.base64EncodedStringWithOptions(NSDataBase64EncodingOptions(rawValue: 0))
        return baseKey!
    }
    //Start the stream connection and write the data to the output stream
@@ -206,86 +218,91 @@ public class WebSocket : NSObject, NSStreamDelegate {
        var writeStream: Unmanaged<CFWriteStream>?
        let h: NSString = url.host!
        CFStreamCreatePairWithSocketToHost(nil, h, UInt32(port), &readStream, &writeStream)
-        inputStream = readStream!.takeUnretainedValue()
-        outputStream = writeStream!.takeUnretainedValue()
-        
-        inputStream!.delegate = self
-        outputStream!.delegate = self
+        inputStream = readStream!.takeRetainedValue()
+        outputStream = writeStream!.takeRetainedValue()
+        guard let inStream = inputStream, let outStream = outputStream else { return }
+        inStream.delegate = self
+        outStream.delegate = self
        if url.scheme == "wss" || url.scheme == "https" {
-            inputStream!.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
-            outputStream!.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
+            inStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
+            outStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
+        } else {
+            certValidated = true //not a https session, so no need to check SSL pinning
        }
-        if self.voipEnabled {
-            inputStream!.setProperty(NSStreamNetworkServiceTypeVoIP, forKey: NSStreamNetworkServiceType)
-            outputStream!.setProperty(NSStreamNetworkServiceTypeVoIP, forKey: NSStreamNetworkServiceType)
+        if voipEnabled {
+            inStream.setProperty(NSStreamNetworkServiceTypeVoIP, forKey: NSStreamNetworkServiceType)
+            outStream.setProperty(NSStreamNetworkServiceTypeVoIP, forKey: NSStreamNetworkServiceType)
        }
-        if self.selfSignedSSL {
+        if selfSignedSSL {
            let settings: Dictionary<NSObject, NSObject> = [kCFStreamSSLValidatesCertificateChain: NSNumber(bool:false), kCFStreamSSLPeerName: kCFNull]
-            inputStream!.setProperty(settings, forKey: kCFStreamPropertySSLSettings)
-            outputStream!.setProperty(settings, forKey: kCFStreamPropertySSLSettings)
+            inStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as String)
+            outStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as String)
        }
        isRunLoop = true
-        inputStream!.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
-        outputStream!.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
-        inputStream!.open()
-        outputStream!.open()
+        inStream.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+        outStream.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+        inStream.open()
+        outStream.open()
        let bytes = UnsafePointer<UInt8>(data.bytes)
-        outputStream!.write(bytes, maxLength: data.length)
+        outStream.write(bytes, maxLength: data.length)
        while(isRunLoop) {
            NSRunLoop.currentRunLoop().runMode(NSDefaultRunLoopMode, beforeDate: NSDate.distantFuture() as NSDate)
        }
    }
    //delegate for the stream methods. Processes incoming bytes
-    func stream(aStream: NSStream!, handleEvent eventCode: NSStreamEvent) {
+    public func stream(aStream: NSStream, handleEvent eventCode: NSStreamEvent) {
        
+        if let sec = security where !certValidated && (eventCode == .HasBytesAvailable || eventCode == .HasSpaceAvailable) {
+            let possibleTrust: AnyObject? = aStream.propertyForKey(kCFStreamPropertySSLPeerTrust as String)
+            if let trust: AnyObject = possibleTrust {
+                let domain: AnyObject? = aStream.propertyForKey(kCFStreamSSLPeerName as String)
+                if sec.isValid(trust as! SecTrustRef, domain: domain as! String?) {
+                    certValidated = true
+                } else {
+                    let error = errorWithDetail("Invalid SSL certificate", code: 1)
+                    disconnectStream(error)
+                    return
+                }
+            }
+        }
        if eventCode == .HasBytesAvailable {
            if(aStream == inputStream) {
                processInputStream()
            }
        } else if eventCode == .ErrorOccurred {
-            disconnectStream(aStream!.streamError)
+            disconnectStream(aStream.streamError)
        } else if eventCode == .EndEncountered {
            disconnectStream(nil)
        }
    }
    //disconnect the stream object
    private func disconnectStream(error: NSError?) {
-        if writeQueue != nil {
-            writeQueue!.waitUntilAllOperationsAreFinished()
+        writeQueue.waitUntilAllOperationsAreFinished()
+        if let stream = inputStream {
+            stream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+            stream.close()
        }
-        inputStream!.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
-        outputStream!.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
-        inputStream!.close()
-        outputStream!.close()
-        inputStream = nil
+        if let stream = outputStream {
+            stream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
+            stream.close()
+        }        
        outputStream = nil
        isRunLoop = false
+        certValidated = false
+        doDisconnect(error)
        connected = false
-        dispatch_async(dispatch_get_main_queue(),{
-            if let disconnectBlock = self.disconnectedBlock {
-                disconnectBlock(error)
-            }
-            self.delegate?.websocketDidDisconnect(self, error: error)
-        })
    }
    
    ///handles the incoming bytes and sending them to the proper processing method
    private func processInputStream() {
        let buf = NSMutableData(capacity: BUFFER_MAX)
-        var buffer = UnsafeMutablePointer<UInt8>(buf!.bytes)
+        let buffer = UnsafeMutablePointer<UInt8>(buf!.bytes)
        let length = inputStream!.read(buffer, maxLength: BUFFER_MAX)
        if length > 0 {
            if !connected {
-                connected = processHTTP(buffer, bufferLen: length)
-                if !connected {
-                    dispatch_async(dispatch_get_main_queue(),{
-                        //self.workaroundMethod()
-                        let error = self.errorWithDetail("Invalid HTTP upgrade", code: 1)
-                        if let disconnect = self.disconnectedBlock {
-                            disconnect(error)
-                        }
-                        self.delegate?.websocketDidDisconnect(self, error: error)
-                    })
+                let status = processHTTP(buffer, bufferLen: length)
+                if !status {
+                    doDisconnect(errorWithDetail("Invalid HTTP upgrade", code: 1))
                }
            } else {
                var process = false
@@ -304,8 +321,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
        if inputQueue.count > 0 {
            let data = inputQueue[0]
            var work = data
-            if (fragBuffer != nil) {
-                var combine = NSMutableData(data: fragBuffer!)
+            if fragBuffer != nil {
+                let combine = NSMutableData(data: fragBuffer!)
                combine.appendData(data)
                work = combine
                fragBuffer = nil
@@ -318,7 +335,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
    }
    ///Finds the HTTP Packet in the TCP stream, by looking for the CRLF.
    private func processHTTP(buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Bool {
-        let CRLFBytes = [UInt8("\r"), UInt8("\n"), UInt8("\r"), UInt8("\n")]
+        let CRLFBytes = [UInt8(ascii: "\r"), UInt8(ascii: "\n"), UInt8(ascii: "\r"), UInt8(ascii: "\n")]
        var k = 0
        var totalSize = 0
        for var i = 0; i < bufferLen; i++ {
@@ -334,12 +351,13 @@ public class WebSocket : NSObject, NSStreamDelegate {
        }
        if totalSize > 0 {
            if validateResponse(buffer, bufferLen: totalSize) {
-                dispatch_async(dispatch_get_main_queue(),{
-                    //self.workaroundMethod()
-                    if let connectBlock = self.connectedBlock {
+                dispatch_async(queue,{ [weak self] in
+                    guard let s = self else { return }
+                    s.connected = true
+                    if let connectBlock = s.onConnect {
                        connectBlock()
                    }
-                    self.delegate?.websocketDidConnect(self)
+                    s.delegate?.websocketDidConnect(s)
                })
                totalSize += 1 //skip the last \n
                let restSize = bufferLen - totalSize
@@ -354,23 +372,24 @@ public class WebSocket : NSObject, NSStreamDelegate {
    
    ///validates the HTTP is a 101 as per the RFC spec
    private func validateResponse(buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Bool {
-        let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, 0)
-        CFHTTPMessageAppendBytes(response.takeUnretainedValue(), buffer, bufferLen)
-        if CFHTTPMessageGetResponseStatusCode(response.takeUnretainedValue()) != 101 {
+        let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, false).takeRetainedValue()
+        CFHTTPMessageAppendBytes(response, buffer, bufferLen)
+        if CFHTTPMessageGetResponseStatusCode(response) != 101 {
            return false
        }
-        let cfHeaders = CFHTTPMessageCopyAllHeaderFields(response.takeUnretainedValue())
-        let headers: NSDictionary = cfHeaders.takeUnretainedValue()
-        let acceptKey = headers[headerWSAcceptName] as NSString
-        if acceptKey.length > 0 {
-            return true
+        if let cfHeaders = CFHTTPMessageCopyAllHeaderFields(response) {
+            let headers = cfHeaders.takeRetainedValue() as NSDictionary
+            let acceptKey = headers[headerWSAcceptName] as! NSString
+            if acceptKey.length > 0 {
+                return true
+            }
        }
        return false
    }
    
    ///process the websocket data
    private func processRawMessage(buffer: UnsafePointer<UInt8>, bufferLen: Int) {
-        var response = readStack.last
+        let response = readStack.last
        if response != nil && bufferLen < 2  {
            fragBuffer = NSData(bytes: buffer, length: bufferLen)
            return
@@ -386,7 +405,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
            resp.bytesLeft -= len
            resp.buffer?.appendData(NSData(bytes: buffer, length: len))
            processResponse(resp)
-            var offset = bufferLen - extra
+            let offset = bufferLen - extra
            if extra > 0 {
                processExtra((buffer+offset), bufferLen: extra)
            }
@@ -399,11 +418,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
            var offset = 2
            if((isMasked > 0 || (RSVMask & buffer[0]) > 0) && receivedOpcode != OpCode.Pong.rawValue) {
                let errCode = CloseCode.ProtocolError.rawValue
-                let error = self.errorWithDetail("masked and rsv data is not currently supported", code: errCode)
-                if let disconnect = self.disconnectedBlock {
-                    disconnect(error)
-                }
-                self.delegate?.websocketDidDisconnect(self, error: error)
+                doDisconnect(errorWithDetail("masked and rsv data is not currently supported", code: errCode))
                writeError(errCode)
                return
            }
@@ -411,21 +426,13 @@ public class WebSocket : NSObject, NSStreamDelegate {
            if !isControlFrame && (receivedOpcode != OpCode.BinaryFrame.rawValue && receivedOpcode != OpCode.ContinueFrame.rawValue &&
                receivedOpcode != OpCode.TextFrame.rawValue && receivedOpcode != OpCode.Pong.rawValue) {
                    let errCode = CloseCode.ProtocolError.rawValue
-                    let error = self.errorWithDetail("unknown opcode: \(receivedOpcode)", code: errCode)
-                    if let disconnect = self.disconnectedBlock {
-                        disconnect(error)
-                    }
-                    self.delegate?.websocketDidDisconnect(self, error: error)
+                    doDisconnect(errorWithDetail("unknown opcode: \(receivedOpcode)", code: errCode))
                    writeError(errCode)
                    return
            }
            if isControlFrame && isFin == 0 {
                let errCode = CloseCode.ProtocolError.rawValue
-                let error = self.errorWithDetail("control frames can't be fragmented", code: errCode)
-                if let disconnect = self.disconnectedBlock {
-                    disconnect(error)
-                }
-                self.delegate?.websocketDidDisconnect(self, error: error)
+                doDisconnect(errorWithDetail("control frames can't be fragmented", code: errCode))
                writeError(errCode)
                return
            }
@@ -434,8 +441,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
                if payloadLen == 1 {
                    code = CloseCode.ProtocolError.rawValue
                } else if payloadLen > 1 {
-                    var codeBuffer = UnsafePointer<UInt16>((buffer+offset))
-                    code = codeBuffer[0].byteSwapped
+                    let codeBuffer = UnsafePointer<UInt16>((buffer+offset))
+                    code = codeBuffer[0].bigEndian
                    if code < 1000 || (code > 1003 && code < 1007) || (code > 1011 && code < 3000) {
                        code = CloseCode.ProtocolError.rawValue
                    }
@@ -445,12 +452,13 @@ public class WebSocket : NSObject, NSStreamDelegate {
                    let len = Int(payloadLen-2)
                    if len > 0 {
                        let bytes = UnsafePointer<UInt8>((buffer+offset))
-                        var str: NSString? = NSString(data: NSData(bytes: bytes, length: len), encoding: NSUTF8StringEncoding)
+                        let str: NSString? = NSString(data: NSData(bytes: bytes, length: len), encoding: NSUTF8StringEncoding)
                        if str == nil {
                            code = CloseCode.ProtocolError.rawValue
                        }
                    }
                }
+                doDisconnect(errorWithDetail("connection closed by server", code: code))
                writeError(code)
                return
            }
@@ -461,13 +469,17 @@ public class WebSocket : NSObject, NSStreamDelegate {
            var dataLength = UInt64(payloadLen)
            if dataLength == 127 {
                let bytes = UnsafePointer<UInt64>((buffer+offset))
-                dataLength = bytes[0].byteSwapped
+                dataLength = bytes[0].bigEndian
                offset += sizeof(UInt64)
            } else if dataLength == 126 {
                let bytes = UnsafePointer<UInt16>((buffer+offset))
-                dataLength = UInt64(bytes[0].byteSwapped)
+                dataLength = UInt64(bytes[0].bigEndian)
                offset += sizeof(UInt16)
            }
+            if bufferLen < offset || UInt64(bufferLen - offset) < dataLength {
+                fragBuffer = NSData(bytes: buffer, length: bufferLen)
+                return
+            }
            var len = dataLength
            if dataLength > UInt64(bufferLen) {
                len = UInt64(bufferLen-offset)
@@ -480,7 +492,15 @@ public class WebSocket : NSObject, NSStreamDelegate {
                data = NSData(bytes: UnsafePointer<UInt8>((buffer+offset)), length: Int(len))
            }
            if receivedOpcode == OpCode.Pong.rawValue {
-                let step = Int(offset+len)
+                dispatch_async(queue,{ [weak self] in
+                    guard let s = self else { return }
+                    if let pongBlock = s.onPong {
+                        pongBlock()
+                    }
+                    s.pongDelegate?.websocketDidReceivePong(s)
+                })
+                
+                let step = Int(offset+numericCast(len))
                let extra = bufferLen-step
                if extra > 0 {
                    processRawMessage((buffer+step), bufferLen: extra)
@@ -493,11 +513,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
            }
            if isFin == 0 && receivedOpcode == OpCode.ContinueFrame.rawValue && response == nil {
                let errCode = CloseCode.ProtocolError.rawValue
-                let error = self.errorWithDetail("continue frame before a binary or text frame", code: errCode)
-                if let disconnect = self.disconnectedBlock {
-                    disconnect(error)
-                }
-                self.delegate?.websocketDidDisconnect(self, error: error)
+                doDisconnect(errorWithDetail("continue frame before a binary or text frame", code: errCode))
                writeError(errCode)
                return
            }
@@ -505,12 +521,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
            if(response == nil) {
                if receivedOpcode == OpCode.ContinueFrame.rawValue  {
                    let errCode = CloseCode.ProtocolError.rawValue
-                    let error = self.errorWithDetail("first frame can't be a continue frame",
-                        code: errCode)
-                    if let disconnect = self.disconnectedBlock {
-                        disconnect(error)
-                    }
-                    self.delegate?.websocketDidDisconnect(self, error: error)
+                    doDisconnect(errorWithDetail("first frame can't be a continue frame",
+                        code: errCode))
                    writeError(errCode)
                    return
                }
@@ -524,12 +536,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
                    response!.bytesLeft = Int(dataLength)
                } else {
                    let errCode = CloseCode.ProtocolError.rawValue
-                    let error = self.errorWithDetail("second and beyond of fragment message must be a continue frame",
-                        code: errCode)
-                    if let disconnect = self.disconnectedBlock {
-                        disconnect(error)
-                    }
-                    self.delegate?.websocketDidDisconnect(self, error: error)
+                    doDisconnect(errorWithDetail("second and beyond of fragment message must be a continue frame",
+                        code: errCode))
                    writeError(errCode)
                    return
                }
@@ -545,7 +553,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
                processResponse(response!)
            }
            
-            let step = Int(offset+len)
+            let step = Int(offset+numericCast(len))
            let extra = bufferLen-step
            if(extra > 0) {
                processExtra((buffer+step), bufferLen: extra)
@@ -570,25 +578,27 @@ public class WebSocket : NSObject, NSStreamDelegate {
                let data = response.buffer! //local copy so it is perverse for writing
                dequeueWrite(data, code: OpCode.Pong)
            } else if response.code == .TextFrame {
-                var str: NSString? = NSString(data: response.buffer!, encoding: NSUTF8StringEncoding)
+                let str: NSString? = NSString(data: response.buffer!, encoding: NSUTF8StringEncoding)
                if str == nil {
                    writeError(CloseCode.Encoding.rawValue)
                    return false
                }
-                dispatch_async(dispatch_get_main_queue(),{
-                    if let textBlock = self.receivedTextBlock{
-                        textBlock(str!)
+
+                dispatch_async(queue,{ [weak self] in
+                    guard let s = self else { return }
+                    if let textBlock = s.onText {
+                        textBlock(str! as String)
                    }
-                    self.delegate?.websocketDidReceiveMessage(self, text: str!)
+                    s.delegate?.websocketDidReceiveMessage(s, text: str! as String)
                })
            } else if response.code == .BinaryFrame {
                let data = response.buffer! //local copy so it is perverse for writing
-                dispatch_async(dispatch_get_main_queue(),{
-                    //self.workaroundMethod()
-                    if let dataBlock = self.receivedDataBlock{
+                dispatch_async(queue,{ [weak self] in
+                    guard let s = self else { return }
+                    if let dataBlock = s.onData {
                        dataBlock(data)
                    }
-                    self.delegate?.websocketDidReceiveData(self, data: data)
+                    s.delegate?.websocketDidReceiveData(s, data: data)
                })
            }
            readStack.removeLast()
@@ -607,53 +617,40 @@ public class WebSocket : NSObject, NSStreamDelegate {
    ///write a an error to the socket
    private func writeError(code: UInt16) {
        let buf = NSMutableData(capacity: sizeof(UInt16))
-        var buffer = UnsafeMutablePointer<UInt16>(buf!.bytes)
-        buffer[0] = code.byteSwapped
+        let buffer = UnsafeMutablePointer<UInt16>(buf!.bytes)
+        buffer[0] = code.bigEndian
        dequeueWrite(NSData(bytes: buffer, length: sizeof(UInt16)), code: .ConnectionClose)
    }
-    ///used to write things to the stream in a
+    ///used to write things to the stream
    private func dequeueWrite(data: NSData, code: OpCode) {
-        if writeQueue == nil {
-            writeQueue = NSOperationQueue()
-            writeQueue!.maxConcurrentOperationCount = 1
+        if !isConnected {
+            return
        }
-        writeQueue!.addOperationWithBlock {
+        writeQueue.addOperationWithBlock { [weak self] in
            //stream isn't ready, let's wait
-            var tries = 0;
-            while self.outputStream == nil || !self.connected {
-                if(tries < 5) {
-                    sleep(1);
-                } else {
-                    break;
-                }
-                tries++;
-            }
-            if !self.connected {
-                return
-            }
+            guard let s = self else { return }
            var offset = 2
-            UINT16_MAX
            let bytes = UnsafeMutablePointer<UInt8>(data.bytes)
            let dataLength = data.length
-            let frame = NSMutableData(capacity: dataLength + self.MaxFrameSize)
+            let frame = NSMutableData(capacity: dataLength + s.MaxFrameSize)
            let buffer = UnsafeMutablePointer<UInt8>(frame!.mutableBytes)
-            buffer[0] = self.FinMask | code.rawValue
+            buffer[0] = s.FinMask | code.rawValue
            if dataLength < 126 {
                buffer[1] = CUnsignedChar(dataLength)
            } else if dataLength <= Int(UInt16.max) {
                buffer[1] = 126
-                var sizeBuffer = UnsafeMutablePointer<UInt16>((buffer+offset))
-                sizeBuffer[0] = UInt16(dataLength).byteSwapped
+                let sizeBuffer = UnsafeMutablePointer<UInt16>((buffer+offset))
+                sizeBuffer[0] = UInt16(dataLength).bigEndian
                offset += sizeof(UInt16)
            } else {
                buffer[1] = 127
-                var sizeBuffer = UnsafeMutablePointer<UInt64>((buffer+offset))
-                sizeBuffer[0] = UInt64(dataLength).byteSwapped
+                let sizeBuffer = UnsafeMutablePointer<UInt64>((buffer+offset))
+                sizeBuffer[0] = UInt64(dataLength).bigEndian
                offset += sizeof(UInt64)
            }
-            buffer[1] |= self.MaskMask
-            var maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
-            SecRandomCopyBytes(kSecRandomDefault, UInt(sizeof(UInt32)), maskKey)
+            buffer[1] |= s.MaskMask
+            let maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
+            SecRandomCopyBytes(kSecRandomDefault, Int(sizeof(UInt32)), maskKey)
            offset += sizeof(UInt32)
            
            for (var i = 0; i < dataLength; i++) {
@@ -662,16 +659,21 @@ public class WebSocket : NSObject, NSStreamDelegate {
            }
            var total = 0
            while true {
-                if self.outputStream == nil {
+                if !s.isConnected {
                    break
                }
+                guard let outStream = s.outputStream else { break }
                let writeBuffer = UnsafePointer<UInt8>(frame!.bytes+total)
-                var len = self.outputStream!.write(writeBuffer, maxLength: offset-total)
+                let len = outStream.write(writeBuffer, maxLength: offset-total)
                if len < 0 {
-                    if let disconnect = self.disconnectedBlock {
-                        disconnect(self.outputStream!.streamError!)
+                    var error: NSError?
+                    if let streamError = outStream.streamError {
+                        error = streamError
+                    } else {
+                        let errCode = InternalErrorCode.OutputStreamWriteError.rawValue
+                        error = s.errorWithDetail("output stream error during write", code: errCode)
                    }
-                    self.delegate?.websocketDidDisconnect(self, error: self.outputStream!.streamError)
+                    s.doDisconnect(error)
                    break
                } else {
                    total += len
@@ -684,4 +686,18 @@ public class WebSocket : NSObject, NSStreamDelegate {
        }
    }
    
+    ///used to preform the disconnect delegate
+    private func doDisconnect(error: NSError?) {
+        if !didDisconnect {
+            dispatch_async(queue,{ [weak self] in
+                guard let s = self else { return }
+                s.didDisconnect = true
+                if let disconnect = s.onDisconnect {
+                    disconnect(error)
+                }
+                s.delegate?.websocketDidDisconnect(s, error: error)
+            })
+        }
+    }
+    
 }
@@ -0,0 +1,27 @@
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
+#
+# Pods/
+
+# Xcode
+.DS_Store
+build
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+*.xccheckout
+*.xcodeproj/*.xcworkspace
@@ -0,0 +1,521 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		5C178E221B62D0B900A97204 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E211B62D0B900A97204 /* AppDelegate.swift */; };
+		5C178E241B62D0B900A97204 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E231B62D0B900A97204 /* ViewController.swift */; };
+		5C178E271B62D0B900A97204 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E251B62D0B900A97204 /* Main.storyboard */; };
+		5C178E291B62D0B900A97204 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E281B62D0B900A97204 /* Images.xcassets */; };
+		5C178E2C1B62D0B900A97204 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */; };
+		5C178E381B62D0B900A97204 /* AutobahnTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E371B62D0B900A97204 /* AutobahnTests.swift */; };
+		5C178E521B62D11200A97204 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C178E491B62D0EF00A97204 /* Starscream.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		5C178E321B62D0B900A97204 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E141B62D0B900A97204 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5C178E1B1B62D0B900A97204;
+			remoteInfo = Autobahn;
+		};
+		5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
+			remoteInfo = Starscream;
+		};
+		5C178E4A1B62D0EF00A97204 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 6B3E79F119D48B7F006071F7;
+			remoteInfo = StarscreamTests;
+		};
+		5C178E4C1B62D0EF00A97204 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
+			remoteInfo = StarscreamOSX;
+		};
+		5C178E4E1B62D0EF00A97204 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D9C3E36919E48FF1009FC285;
+			remoteInfo = StarscreamOSXTests;
+		};
+		5C178E501B62D10A00A97204 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
+			remoteInfo = Starscream;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		5C178E1C1B62D0B900A97204 /* Autobahn.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Autobahn.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		5C178E201B62D0B900A97204 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		5C178E211B62D0B900A97204 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		5C178E231B62D0B900A97204 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		5C178E261B62D0B900A97204 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		5C178E281B62D0B900A97204 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		5C178E2B1B62D0B900A97204 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
+		5C178E311B62D0B900A97204 /* AutobahnTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AutobahnTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		5C178E361B62D0B900A97204 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		5C178E371B62D0B900A97204 /* AutobahnTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutobahnTests.swift; sourceTree = "<group>"; };
+		5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../../Starscream.xcodeproj; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		5C178E191B62D0B900A97204 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5C178E521B62D11200A97204 /* Starscream.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		5C178E2E1B62D0B900A97204 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		5C178E131B62D0B900A97204 = {
+			isa = PBXGroup;
+			children = (
+				5C178E1E1B62D0B900A97204 /* Autobahn */,
+				5C178E341B62D0B900A97204 /* AutobahnTests */,
+				5C178E1D1B62D0B900A97204 /* Products */,
+				5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */,
+			);
+			sourceTree = "<group>";
+		};
+		5C178E1D1B62D0B900A97204 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5C178E1C1B62D0B900A97204 /* Autobahn.app */,
+				5C178E311B62D0B900A97204 /* AutobahnTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		5C178E1E1B62D0B900A97204 /* Autobahn */ = {
+			isa = PBXGroup;
+			children = (
+				5C178E211B62D0B900A97204 /* AppDelegate.swift */,
+				5C178E231B62D0B900A97204 /* ViewController.swift */,
+				5C178E251B62D0B900A97204 /* Main.storyboard */,
+				5C178E281B62D0B900A97204 /* Images.xcassets */,
+				5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */,
+				5C178E1F1B62D0B900A97204 /* Supporting Files */,
+			);
+			path = Autobahn;
+			sourceTree = "<group>";
+		};
+		5C178E1F1B62D0B900A97204 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				5C178E201B62D0B900A97204 /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		5C178E341B62D0B900A97204 /* AutobahnTests */ = {
+			isa = PBXGroup;
+			children = (
+				5C178E371B62D0B900A97204 /* AutobahnTests.swift */,
+				5C178E351B62D0B900A97204 /* Supporting Files */,
+			);
+			path = AutobahnTests;
+			sourceTree = "<group>";
+		};
+		5C178E351B62D0B900A97204 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				5C178E361B62D0B900A97204 /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		5C178E421B62D0EF00A97204 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5C178E491B62D0EF00A97204 /* Starscream.framework */,
+				5C178E4B1B62D0EF00A97204 /* StarscreamTests.xctest */,
+				5C178E4D1B62D0EF00A97204 /* Starscream.framework */,
+				5C178E4F1B62D0EF00A97204 /* StarscreamOSXTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		5C178E1B1B62D0B900A97204 /* Autobahn */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 5C178E3B1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "Autobahn" */;
+			buildPhases = (
+				5C178E181B62D0B900A97204 /* Sources */,
+				5C178E191B62D0B900A97204 /* Frameworks */,
+				5C178E1A1B62D0B900A97204 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				5C178E511B62D10A00A97204 /* PBXTargetDependency */,
+			);
+			name = Autobahn;
+			productName = Autobahn;
+			productReference = 5C178E1C1B62D0B900A97204 /* Autobahn.app */;
+			productType = "com.apple.product-type.application";
+		};
+		5C178E301B62D0B900A97204 /* AutobahnTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 5C178E3E1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "AutobahnTests" */;
+			buildPhases = (
+				5C178E2D1B62D0B900A97204 /* Sources */,
+				5C178E2E1B62D0B900A97204 /* Frameworks */,
+				5C178E2F1B62D0B900A97204 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				5C178E331B62D0B900A97204 /* PBXTargetDependency */,
+			);
+			name = AutobahnTests;
+			productName = AutobahnTests;
+			productReference = 5C178E311B62D0B900A97204 /* AutobahnTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		5C178E141B62D0B900A97204 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0640;
+				ORGANIZATIONNAME = vluxe;
+				TargetAttributes = {
+					5C178E1B1B62D0B900A97204 = {
+						CreatedOnToolsVersion = 6.4;
+					};
+					5C178E301B62D0B900A97204 = {
+						CreatedOnToolsVersion = 6.4;
+						TestTargetID = 5C178E1B1B62D0B900A97204;
+					};
+				};
+			};
+			buildConfigurationList = 5C178E171B62D0B900A97204 /* Build configuration list for PBXProject "Autobahn" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 5C178E131B62D0B900A97204;
+			productRefGroup = 5C178E1D1B62D0B900A97204 /* Products */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 5C178E421B62D0EF00A97204 /* Products */;
+					ProjectRef = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				5C178E1B1B62D0B900A97204 /* Autobahn */,
+				5C178E301B62D0B900A97204 /* AutobahnTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		5C178E491B62D0EF00A97204 /* Starscream.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Starscream.framework;
+			remoteRef = 5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5C178E4B1B62D0EF00A97204 /* StarscreamTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = StarscreamTests.xctest;
+			remoteRef = 5C178E4A1B62D0EF00A97204 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5C178E4D1B62D0EF00A97204 /* Starscream.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Starscream.framework;
+			remoteRef = 5C178E4C1B62D0EF00A97204 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5C178E4F1B62D0EF00A97204 /* StarscreamOSXTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = StarscreamOSXTests.xctest;
+			remoteRef = 5C178E4E1B62D0EF00A97204 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXResourcesBuildPhase section */
+		5C178E1A1B62D0B900A97204 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5C178E271B62D0B900A97204 /* Main.storyboard in Resources */,
+				5C178E2C1B62D0B900A97204 /* LaunchScreen.xib in Resources */,
+				5C178E291B62D0B900A97204 /* Images.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		5C178E2F1B62D0B900A97204 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		5C178E181B62D0B900A97204 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5C178E241B62D0B900A97204 /* ViewController.swift in Sources */,
+				5C178E221B62D0B900A97204 /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		5C178E2D1B62D0B900A97204 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5C178E381B62D0B900A97204 /* AutobahnTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		5C178E331B62D0B900A97204 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5C178E1B1B62D0B900A97204 /* Autobahn */;
+			targetProxy = 5C178E321B62D0B900A97204 /* PBXContainerItemProxy */;
+		};
+		5C178E511B62D10A00A97204 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Starscream;
+			targetProxy = 5C178E501B62D10A00A97204 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		5C178E251B62D0B900A97204 /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5C178E261B62D0B900A97204 /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5C178E2B1B62D0B900A97204 /* Base */,
+			);
+			name = LaunchScreen.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		5C178E391B62D0B900A97204 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		5C178E3A1B62D0B900A97204 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		5C178E3C1B62D0B900A97204 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = Autobahn/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		5C178E3D1B62D0B900A97204 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = Autobahn/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		5C178E3F1B62D0B900A97204 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = AutobahnTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
+			};
+			name = Debug;
+		};
+		5C178E401B62D0B900A97204 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = AutobahnTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		5C178E171B62D0B900A97204 /* Build configuration list for PBXProject "Autobahn" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5C178E391B62D0B900A97204 /* Debug */,
+				5C178E3A1B62D0B900A97204 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5C178E3B1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "Autobahn" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5C178E3C1B62D0B900A97204 /* Debug */,
+				5C178E3D1B62D0B900A97204 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5C178E3E1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "AutobahnTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5C178E3F1B62D0B900A97204 /* Debug */,
+				5C178E401B62D0B900A97204 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 5C178E141B62D0B900A97204 /* Project object */;
+}
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Autobahn.xcodeproj">
+   </FileRef>
+</Workspace>
@@ -0,0 +1,46 @@
+//
+//  AppDelegate.swift
+//  Autobahn
+//
+//  Created by Dalton Cherry on 7/24/15.
+//  Copyright (c) 2015 vluxe. All rights reserved.
+//
+
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    func applicationWillResignActive(application: UIApplication) {
+        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    }
+
+    func applicationDidEnterBackground(application: UIApplication) {
+        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
+        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+    }
+
+    func applicationWillEnterForeground(application: UIApplication) {
+        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+    }
+
+    func applicationDidBecomeActive(application: UIApplication) {
+        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    }
+
+    func applicationWillTerminate(application: UIApplication) {
+        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    }
+
+
+}
+
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 vluxe. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Autobahn" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
+        </view>
+    </objects>
+</document>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
@@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
@@ -0,0 +1,137 @@
+//
+//  ViewController.swift
+//  Autobahn
+//
+//  Created by Dalton Cherry on 7/24/15.
+//  Copyright (c) 2015 vluxe. All rights reserved.
+//
+
+import UIKit
+import Starscream
+
+class ViewController: UIViewController {
+    
+    static let host = "localhost:9001"
+    static let scheme = "ws"
+    var socket = WebSocket(url: NSURL(scheme: scheme, host: host, path: "/getCaseCount")!, protocols: [])
+    var caseCount = 300 //starting cases
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        getCaseCount()
+        //getTestInfo(1)
+    }
+    
+    func getCaseCount() {
+        socket.onText = {(text: String) in
+            if let c = text.toInt() {
+                println("number of cases is: \(c)")
+                self.caseCount = c
+            }
+        }
+        socket.onDisconnect = {(error: NSError?) in
+            self.getTestInfo(1)
+        }
+        socket.connect()
+    }
+    
+    func getTestInfo(caseNum: Int) {
+        socket = createSocket("getCaseInfo",caseNum)
+        socket.onText = {(text: String) in
+            var error: NSError?
+            let data = text.dataUsingEncoding(NSUTF8StringEncoding)
+            var resp: AnyObject? = NSJSONSerialization.JSONObjectWithData(data!,
+                options: NSJSONReadingOptions(), error: &error)
+            if let dict = resp as? Dictionary<String,String> {
+                let num = dict["id"]
+                let summary = dict["description"]
+                if let n = num, let sum = summary {
+                    //println("running case:\(caseNum) id:\(n) summary: \(sum)")
+                }
+            }
+        }
+        var once = false
+        socket.onDisconnect = {(error: NSError?) in
+            if !once {
+                once = true
+                self.runTest(caseNum)
+            }
+        }
+        socket.connect()
+    }
+    
+    func runTest(caseNum: Int) {
+        socket = createSocket("runCase",caseNum)
+        socket.onText = {(text: String) in
+            self.socket.writeString(text)
+        }
+        socket.onData = {(data: NSData) in
+            self.socket.writeData(data)
+        }
+        var once = false
+        socket.onDisconnect = {(error: NSError?) in
+            if !once {
+                once = true
+                println("case:\(caseNum) finished")
+                self.verifyTest(caseNum)
+            }
+        }
+        socket.connect()
+    }
+    
+    func verifyTest(caseNum: Int) {
+        socket = createSocket("getCaseStatus",caseNum)
+        socket.onText = {(text: String) in
+            var error: NSError?
+            let data = text.dataUsingEncoding(NSUTF8StringEncoding)
+            var resp: AnyObject? = NSJSONSerialization.JSONObjectWithData(data!,
+                options: NSJSONReadingOptions(), error: &error)
+            if let dict = resp as? Dictionary<String,String> {
+                if let status = dict["behavior"] {
+                    if status == "OK" {
+                        println("SUCCESS: \(caseNum)")
+                        return
+                    }
+                }
+                println("FAILURE: \(caseNum)")
+            }
+        }
+        var once = false
+        socket.onDisconnect = {(error: NSError?) in
+            if !once {
+                once = true
+                let nextCase = caseNum+1
+                if nextCase <= self.caseCount {
+                    self.getTestInfo(nextCase)
+                } else {
+                    self.finishReports()
+                }
+            }
+        }
+        socket.connect()
+    }
+    
+    func finishReports() {
+        socket = createSocket("updateReports",0)
+        socket.onDisconnect = {(error: NSError?) in
+            println("finished all the tests!")
+        }
+        socket.connect()
+    }
+    
+    func createSocket(cmd: String, _ caseNum: Int) -> WebSocket {
+        return WebSocket(url: NSURL(scheme: ViewController.scheme,
+            host: ViewController.host, path: buildPath(cmd,caseNum))!, protocols: [])
+    }
+    
+    func buildPath(cmd: String, _ caseNum: Int) -> String {
+        return "/\(cmd)?case=\(caseNum)&agent=Starscream"
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+
+
+}
+
@@ -0,0 +1,36 @@
+//
+//  AutobahnTests.swift
+//  AutobahnTests
+//
+//  Created by Dalton Cherry on 7/24/15.
+//  Copyright (c) 2015 vluxe. All rights reserved.
+//
+
+import UIKit
+import XCTest
+
+class AutobahnTests: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func testExample() {
+        // This is an example of a functional test case.
+        XCTAssert(true, "Pass")
+    }
+    
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measureBlock() {
+            // Put the code you want to measure the time of here.
+        }
+    }
+    
+}
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
@@ -0,0 +1,27 @@
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
+#
+# Pods/
+
+# Xcode
+.DS_Store
+build
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+*.xccheckout
+*.xcodeproj/*.xcworkspace
@@ -16,6 +16,27 @@
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
+		5C06AE841B08044600D41060 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
+			remoteInfo = Starscream;
+		};
+		5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
+			remoteInfo = StarscreamOSX;
+		};
+		5C06AE8C1B08044600D41060 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D9C3E36919E48FF1009FC285;
+			remoteInfo = StarscreamOSXTests;
+		};
 		6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
@@ -109,6 +130,8 @@
 			children = (
 				6B3E7A0E19D48D00006071F7 /* Starscream.framework */,
 				6B3E7A1019D48D00006071F7 /* StarscreamTests.xctest */,
+				5C06AE8B1B08044600D41060 /* Starscream.framework */,
+				5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -128,6 +151,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				5C06AE851B08044600D41060 /* PBXTargetDependency */,
 			);
 			name = SimpleTest;
 			productName = SimpleTest;
@@ -140,6 +164,7 @@
 		5C765AD3199A6DAA003D9110 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = vluxe;
 				TargetAttributes = {
@@ -173,6 +198,20 @@
 /* End PBXProject section */

 /* Begin PBXReferenceProxy section */
+		5C06AE8B1B08044600D41060 /* Starscream.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Starscream.framework;
+			remoteRef = 5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = StarscreamOSXTests.xctest;
+			remoteRef = 5C06AE8C1B08044600D41060 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		6B3E7A0E19D48D00006071F7 /* Starscream.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -213,6 +252,14 @@
 		};
 /* End PBXSourcesBuildPhase section */

+/* Begin PBXTargetDependency section */
+		5C06AE851B08044600D41060 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Starscream;
+			targetProxy = 5C06AE841B08044600D41060 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		5C765AE4199A6DAA003D9110 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -11,7 +11,7 @@
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D</key>
-		<string>https://github.com/daltoniam/starscream.git</string>
+		<string>https://github.com/daltoniam/Starscream</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>examples/SimpleTest/SimpleTest.xcodeproj</string>
@@ -21,7 +21,7 @@
 		<string>../../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/daltoniam/starscream.git</string>
+	<string>https://github.com/daltoniam/Starscream</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
@@ -34,7 +34,7 @@
 			<key>IDESourceControlWCCIdentifierKey</key>
 			<string>C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D</string>
 			<key>IDESourceControlWCCName</key>
-			<string>starscream</string>
+			<string>Starscream</string>
 		</dict>
 	</array>
 </dict>
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(application: UIApplication!, didFinishLaunchingWithOptions launchOptions: NSDictionary!) -> Bool {
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }

-    func applicationWillResignActive(application: UIApplication!) {
+    func applicationWillResignActive(application: UIApplication) {
        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
    }

-    func applicationDidEnterBackground(application: UIApplication!) {
+    func applicationDidEnterBackground(application: UIApplication) {
        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
    }

-    func applicationWillEnterForeground(application: UIApplication!) {
+    func applicationWillEnterForeground(application: UIApplication) {
        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
    }

-    func applicationDidBecomeActive(application: UIApplication!) {
+    func applicationDidBecomeActive(application: UIApplication) {
        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
    }

-    func applicationWillTerminate(application: UIApplication!) {
+    func applicationWillTerminate(application: UIApplication) {
        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
    }

@@ -20,28 +20,24 @@ class ViewController: UIViewController, WebSocketDelegate {
    
    // MARK: Websocket Delegate Methods.
    
-    func websocketDidConnect() {
-        println("websocket is connected")
+    func websocketDidConnect(ws: WebSocket) {
+        print("websocket is connected")
    }
    
-    func websocketDidDisconnect(error: NSError?) {
+    func websocketDidDisconnect(ws: WebSocket, error: NSError?) {
        if let e = error {
-            println("websocket is disconnected: \(e.localizedDescription)")
+            print("websocket is disconnected: \(e.localizedDescription)")
+        } else {
+             print("websocket disconnected")
        }
    }
    
-    func websocketDidWriteError(error: NSError?) {
-        if let e = error {
-            println("wez got an error from the websocket: \(e.localizedDescription)")
-        }
+    func websocketDidReceiveMessage(ws: WebSocket, text: String) {
+        print("Received text: \(text)")
    }
    
-    func websocketDidReceiveMessage(text: String) {
-        println("Received text: \(text)")
-    }
-    
-    func websocketDidReceiveData(data: NSData) {
-        println("Received data: \(data.length)")
+    func websocketDidReceiveData(ws: WebSocket, data: NSData) {
+        print("Received data: \(data.length)")
    }
    
    // MARK: Write Text Action
Author	SHA1	Message	Date
Dalton	c8201ec71c	README update	2015-09-18 10:40:21 -07:00
Dalton	f990c68c53	fixed conflicts	2015-09-14 09:56:30 -07:00
Dalton	9d37723c4d	ready to become the master	2015-09-14 09:49:33 -07:00
Dalton	b32048b229	ready to become the master	2015-09-14 09:47:31 -07:00
Dalton	a40f448a16	quick README update	2015-09-14 09:32:49 -07:00
Dalton	dcb046a46c	bumped podspec	2015-09-14 09:26:01 -07:00
Dalton	357a178a64	last quick fix for #113	2015-09-14 09:24:45 -07:00
Dalton	7a15d7d7e6	fix for #113	2015-09-11 10:52:07 -07:00
Dalton	13f7502163	cleanup for Swift 2	2015-09-10 17:17:42 -07:00
Dalton	2e5cb03ac3	fix for #115	2015-09-10 15:59:29 -07:00
Dalton	b26ffa28cd	fix for #115	2015-09-10 15:57:34 -07:00
Dalton	fd18936144	write queue change	2015-09-04 15:14:43 -07:00
Dalton	e30b9a6f78	updated podspec	2015-09-04 13:33:40 -07:00
Dalton	b962e3e532	fixed conflicts	2015-09-04 13:30:52 -07:00
Dalton	889d2880eb	switch from unowned to weak	2015-09-04 13:21:28 -07:00
Dalton	f509d9d485	updated podspec	2015-09-03 20:09:45 -07:00
Dalton	7b46baf12b	better	2015-09-03 20:06:41 -07:00
Dalton	5dfe1fc117	added master fixes	2015-09-03 20:05:33 -07:00
Dalton	f46e64b179	fix for #109 , #105 and socket.io-swift 153	2015-09-03 19:59:26 -07:00
Dalton	02f8eac43b	Merge pull request #108 from FanVox/xcode7_b6 Make compatible with Xcode7 b5	2015-08-25 10:49:25 -07:00
Abizer Nasir	6a318b29d2	Make compatible with Xcode7 b5	2015-08-25 17:30:35 +01:00
Austin	ca478d26b2	fixed conflicts	2015-08-12 19:12:29 -07:00
Austin	d1f3deee70	fix for #103	2015-08-12 10:33:32 -07:00
Dalton	4b65324a8d	Merge pull request #102 from Ewg777/Swift-2.0 xcode 7 beta 5 compatibility	2015-08-07 13:31:16 -07:00
Ewg	9663215089	xcode 7 beta 5 compatibility	2015-08-07 13:13:35 +03:00
Ewg	5d272a80ef	xcode 7 beta 5 compatibility	2015-08-07 13:12:48 +03:00
Dalton	56fb313bc5	added test autobahn project	2015-08-04 10:34:45 -07:00
Dalton	e39ddeecf5	Merge pull request #101 from col/Swift-2.0 Xcode 7 / iOS 9 beta 4 compatibility	2015-07-22 10:38:22 -07:00
Colin Harris	36d4426888	Modified the Security class to make it compatible with Xcode 7 / iOS9 beta 4	2015-07-23 01:15:24 +08:00
Dalton	7b19d84984	fixes for #98 and #99 . Closures are way more awesome. Possible fix for #87 , #77 and fix for #72	2015-07-09 18:41:45 -07:00
Dalton	b3db9d413a	fix for #92	2015-06-14 19:47:09 -07:00
Dalton	a69929fbc1	Merge pull request #95 from ricardopereira/Swift-2.0 Swift 2.0 update	2015-06-10 13:36:29 -07:00
Ricardo Pereira	3178fb1705	#93 Converted to latest swift syntax	2015-06-10 11:58:10 +01:00
Dalton	ea6cdfb6ad	Merge pull request #88 from thbaja/pong-received-delegate Pong received delegate	2015-05-28 13:10:11 -07:00
Thomas B. Jacobsen	74a954ecf5	Adjusted the text formatting around websocketDidReceivePong a bit in the Readme	2015-05-28 15:26:42 +02:00
Thomas B. Jacobsen	072a3c20b2	Updated documentation with websocketDidReceivePong example	2015-05-28 15:12:04 +02:00
Thomas B. Jacobsen	115817d85a	Added a delegate for received pong. It's in a separate protocol to make it optional.	2015-05-28 14:55:17 +02:00
Dalton	da76eba769	Merge pull request #86 from ricardopereira/rp-fix-disconnect-stream doDisconnect uses connected flag	2015-05-27 09:06:42 -07:00
Ricardo Pereira	4c4495da75	doDisconnect uses connected flag	2015-05-27 10:30:15 +01:00
Dalton	4f49db32a3	doDisconnect change	2015-05-25 09:31:07 -07:00
Dalton	b753466d48	README update	2015-05-16 16:20:57 -07:00
Dalton	dce9d6f865	bumped podspec	2015-05-16 16:15:56 -07:00
Dalton	d201b8805f	SSL pinning for #75	2015-05-16 16:15:09 -07:00
Dalton	3574f7ccca	cleanup and fixes #81 , #82	2015-05-16 13:38:42 -07:00
Dalton	74b1d43d87	Merge pull request #79 from AndrewZurn/patch-1 Fix for documented force unwrapping of a potentially nil object	2015-05-10 20:34:08 -07:00
Andrew Zurn	5236b39d2f	Fix for documented force unwrapping of a potentially nil object	2015-05-10 10:10:42 -05:00
Dalton Cherry	3a0bc019a6	Merge branch 'master' of https://github.com/daltoniam/starscream	2015-04-23 08:04:15 -07:00
Dalton Cherry	7b8454e729	README update	2015-04-23 08:04:09 -07:00
Dalton	44e4fc46cb	Merge pull request #73 from yannickl/master [FIX] memory leak with the takeUnretainedValue()	2015-04-21 14:33:01 -07:00
Yannick Loriot	1a2b098896	[FIX] memory leak with the takeUnretainedValue()	2015-04-21 19:03:41 +02:00
Dalton	3d5f525720	Merge pull request #71 from GuessMeApp/master Fix .gitignore so that it ignores Carthage build directory as well	2015-04-18 15:20:29 -07:00
Sergei Cherepanov	01ab7a9d41	Fix .gitignore so that it ignores Carthage build directory as well	2015-04-18 23:44:29 +03:00
Dalton Cherry	553a596ad1	bumped pod	2015-04-09 15:28:50 -07:00
Dalton Cherry	cc91478cde	merged swift 1.2	2015-04-09 15:28:19 -07:00
Dalton Cherry	9ee175a8f6	Merge branch 'swift-1.2'	2015-04-09 08:16:02 -07:00
Dalton	2ed6a3ba3f	Merge pull request #68 from mikajauhonen/master Check target correctly	2015-04-08 13:22:12 -07:00
Mika Jauhonen	f839150743	Check target correctly	2015-04-08 21:40:35 +02:00
Dalton Cherry	00b75106ac	Merge branch 'master' into swift-1.2	2015-04-07 13:29:58 -07:00
Dalton Cherry	b5241956ce	safer	2015-04-07 13:29:34 -07:00
Dalton	927a02ebe5	Merge pull request #67 from ndrppnc/master fixed crash when inputStream and outputStream need to be closed	2015-04-07 12:44:35 -07:00
Andrei Papancea	647fb4cb68	fixed crash when inputStream and outputStream are to be closed when they're nil -- happens when you are on Airplane mode	2015-04-07 12:02:14 -04:00
Dalton Cherry	f9241d39ab	merged from master	2015-03-14 18:55:25 -07:00
Dalton Cherry	274c0e94ad	README update	2015-03-14 18:54:38 -07:00
Dalton Cherry	8d607623f5	Merge branch 'swift-1.2' of https://github.com/daltoniam/starscream into swift-1.2	2015-03-14 18:50:54 -07:00
Dalton Cherry	ae03601a52	Merge branch 'master' into swift-1.2	2015-03-14 18:50:34 -07:00
Dalton Cherry	e1855398c9	Merge branch 'master' of https://github.com/daltoniam/starscream	2015-03-14 18:50:24 -07:00
Dalton Cherry	06761dbe51	README update	2015-03-14 18:50:19 -07:00
Dalton	97f3785287	Merge pull request #63 from pristineio/feature/yodeling-snowcat-ping Yodeling Snowcat - Write ping frames	2015-03-09 09:59:46 -07:00
Rahul Behera	93f934bfa1	update readme	2015-03-09 10:15:42 -05:00
Rahul Behera	b869b321f6	allow user to specify the payload for the data.	2015-03-04 14:59:35 -06:00
Dalton	c95a83f607	Merge pull request #62 from mogstad/swift-1.2 Update syntax to Swift 1.2	2015-03-02 07:46:28 -08:00
Bjarne Mogstad	98f48a158e	Update syntax to Swift 1.2 Fixed the last errors caused by the altered Syntax in Swift 1.2	2015-03-02 16:43:36 +01:00
Rahul Behera	85e0fc1665	Yodel(write) a sound(ping) to the planet(websocket). This sends it as an astroid (control frame)	2015-02-27 10:15:33 -06:00
Dalton Cherry	25ff7ad6f5	Merge branch 'master' into swift-1.2	2015-02-16 09:58:47 -08:00
Dalton Cherry	62f1010578	Merge branch 'master' of https://github.com/daltoniam/starscream	2015-02-16 09:58:25 -08:00
Dalton Cherry	a893d21330	improved OSX framework	2015-02-16 09:58:20 -08:00
Dalton Cherry	4fe0874f96	swift 1.2 update	2015-02-15 20:24:08 -08:00
Dalton Cherry	eb603ea8d6	Merge branch 'master' of https://github.com/daltoniam/starscream into swift-1.2	2015-02-15 20:08:27 -08:00
Dalton Cherry	040da0af16	swift 1.2 update	2015-02-15 20:08:24 -08:00
Dalton	4a2e571e3e	Merge pull request #58 from robskillington/feature/surface-code-when-server-closes-connection Add surfacing of code sent when server closes connection with specific code	2015-02-15 19:47:11 -08:00
Rob Skillington	eae21b74c7	- Call delegate didDisconnect when server closes connection with code - Avoid crashing when outputStream is nil when server closes with code	2015-02-15 17:33:19 -08:00
Dalton Cherry	f7fe6364f7	README update	2015-02-05 17:13:54 -08:00
Dalton Cherry	9cba9ad105	README update	2015-02-05 16:33:06 -08:00
Dalton Cherry	7e1b61da74	README update	2015-02-05 16:28:12 -08:00
Dalton	c902bf58a9	Merge pull request #50 from wentao/master allow changing the queue for executing delegate callbacks	2015-02-05 12:35:23 -08:00
Wentao Zheng	3701ae7fcf	Merge branch 'master' of https://github.com/wentao/Starscream	2015-02-05 14:57:42 -05:00
Wentao Zheng	f5cde43cbc	change queue to public	2015-02-05 14:57:28 -05:00
Wentao Zheng	732cee4ce1	.	2015-02-05 14:56:55 -05:00
Wentao Zheng	4dc35eb139	allow changing the queue for executing delegate callbacks	2015-02-04 23:54:14 -05:00
Dalton Cherry	323918db35	updated example	2015-01-29 16:27:59 -08:00