Merge pull request #131 from SamDecrock/swift-1.2

fixed connect() function using Master code

README.md

@@ -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 the Swift 1.2 branch. The last release of 1.2 was tag `0.9.7`. If you need Swift 2.0 checkout the master branch.
 
 ## Features
 
@@ -24,7 +25,7 @@ import Starscream
 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()
 ```
@@ -81,6 +82,31 @@ func websocketDidReceivePong(socket: WebSocket) {
 }
 ```
 
+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
@@ -141,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()
 ```
@@ -151,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
@@ -165,7 +191,7 @@ socket.selfSignedSSL = true
 SSL Pinning is also supported in Starscream. 
 
 ```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"])
 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
@@ -177,7 +203,7 @@ You load either a `NSData` blob of your certificate or you can use a `SecKeyRef`
 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"])
+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)
 ```
@@ -202,7 +228,7 @@ To use Starscream in your project add the following 'Podfile' to your project
 	platform :ios, '8.0'
 	use_frameworks!
 
-	pod 'Starscream', '~> 0.9.2'
+	pod 'Starscream', '~> 0.9.7'
 
 Then run:
 
@@ -236,11 +262,6 @@ Add the `Starscream.xcodeproj` to your Xcode project. Once that is complete, in
 
 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
-- [ ] Add Unit Tests
-
 ## License
 
 Starscream is licensed under the Apache v2 License.

SSLSecurity.swift

@@ -1,6 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////
 //
-//  Security.swift
+//  SSLSecurity.swift
 //  Starscream
 //
 //  Created by Dalton Cherry on 5/16/15.
@@ -38,7 +38,7 @@ public class SSLCert {
     }
 }
 
-public class Security {
+public class SSLSecurity {
     public var validatedDN = true //should the domain name be validated?
     
     var isReady = false //is the key processing done?

Starscream.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Starscream"
-  s.version      = "0.9.4"
+  s.version      = "0.9.7"
   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'

Starscream.xcodeproj/project.pbxproj

@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5C06AE8F1B08050D00D41060 /* Security.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C06AE8E1B08050D00D41060 /* Security.swift */; };
-		5C06AE901B08050D00D41060 /* Security.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C06AE8E1B08050D00D41060 /* Security.swift */; };
+		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, ); }; };
@@ -29,7 +29,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		5C06AE8E1B08050D00D41060 /* Security.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Security.swift; sourceTree = SOURCE_ROOT; };
+		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; };
@@ -98,7 +98,7 @@
 			isa = PBXGroup;
 			children = (
 				6B3E7A0419D48C41006071F7 /* WebSocket.swift */,
-				5C06AE8E1B08050D00D41060 /* Security.swift */,
+				5C06AE8E1B08050D00D41060 /* SSLSecurity.swift */,
 				6B3E7A0619D48C5F006071F7 /* Starscream.h */,
 				6B3E79E919D48B7F006071F7 /* Supporting Files */,
 			);
@@ -221,6 +221,7 @@
 		6B3E79DD19D48B7F006071F7 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = Vluxe;
 				TargetAttributes = {
@@ -295,7 +296,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6B3E7A0519D48C41006071F7 /* WebSocket.swift in Sources */,
-				5C06AE8F1B08050D00D41060 /* Security.swift in Sources */,
+				5C06AE8F1B08050D00D41060 /* SSLSecurity.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -312,7 +313,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D9C3E37A19E49058009FC285 /* WebSocket.swift in Sources */,
-				5C06AE901B08050D00D41060 /* Security.swift in Sources */,
+				5C06AE901B08050D00D41060 /* SSLSecurity.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

WebSocket.swift

@@ -67,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
@@ -85,6 +85,18 @@ 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?
@@ -95,18 +107,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
     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
-    public var security: Security?
     private var certValidated = 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 didDisconnect = false
     
     //init the websocket with a url
     public init(url: NSURL) {
@@ -117,38 +119,19 @@ public class WebSocket : NSObject, NSStreamDelegate {
         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() {
         if isCreated {
             return
         }
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), {
-            self.isCreated = true
-            self.createHTTPRequest()
-            self.isCreated = false
+        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
         })
     }
     
@@ -179,7 +162,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
         
         let str: NSString = url.absoluteString!
         let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET",
-            url, kCFHTTPVersion1_1)
+            url, kCFHTTPVersion1_1).takeRetainedValue()
         
         var port = url.port
         if port == nil {
@@ -202,14 +185,14 @@ public class WebSocket : NSObject, NSStreamDelegate {
             self.addHeader(urlRequest, key: key, val: value)
         }
         
-        let serializedRequest: NSData = CFHTTPMessageCopySerializedMessage(urlRequest.takeUnretainedValue()).takeUnretainedValue()
+        let serializedRequest: NSData = CFHTTPMessageCopySerializedMessage(urlRequest).takeRetainedValue()
         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)
     }
@@ -234,8 +217,8 @@ 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 = readStream!.takeRetainedValue()
+        outputStream = writeStream!.takeRetainedValue()
         
         inputStream!.delegate = self
         outputStream!.delegate = self
@@ -294,8 +277,8 @@ public class WebSocket : NSObject, NSStreamDelegate {
     }
     //disconnect the stream object
     private func disconnectStream(error: NSError?) {
-        if writeQueue != nil {
-            writeQueue!.waitUntilAllOperationsAreFinished()
+        if let queue = writeQueue {
+            queue.waitUntilAllOperationsAreFinished()
         }
         if let stream = inputStream {
             stream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
@@ -319,9 +302,9 @@ public class WebSocket : NSObject, NSStreamDelegate {
         let length = inputStream!.read(buffer, maxLength: BUFFER_MAX)
         if length > 0 {
             if !connected {
-                connected = processHTTP(buffer, bufferLen: length)
-                if !connected {
-                    self.doDisconnect(self.errorWithDetail("Invalid HTTP upgrade", code: 1))
+                let status = processHTTP(buffer, bufferLen: length)
+                if !status {
+                    doDisconnect(self.errorWithDetail("Invalid HTTP upgrade", code: 1))
                 }
             } else {
                 var process = false
@@ -370,11 +353,14 @@ public class WebSocket : NSObject, NSStreamDelegate {
         }
         if totalSize > 0 {
             if validateResponse(buffer, bufferLen: totalSize) {
-                dispatch_async(queue,{
-                    if let connectBlock = self.connectedBlock {
+                dispatch_async(queue,{ [weak self] in
+                    self?.connected = true
+                    if let connectBlock = self?.onConnect {
                         connectBlock()
                     }
-                    self.delegate?.websocketDidConnect(self)
+                    if let s = self {
+                        s.delegate?.websocketDidConnect(s)
+                    }
                 })
                 totalSize += 1 //skip the last \n
                 let restSize = bufferLen - totalSize
@@ -496,6 +482,10 @@ public class WebSocket : NSObject, NSStreamDelegate {
                 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)
@@ -508,7 +498,15 @@ public class WebSocket : NSObject, NSStreamDelegate {
                 data = NSData(bytes: UnsafePointer<UInt8>((buffer+offset)), length: Int(len))
             }
             if receivedOpcode == OpCode.Pong.rawValue {
-                self.pongDelegate?.websocketDidReceivePong(self)
+                dispatch_async(queue,{ [weak self] in
+                    if let pongBlock = self?.onPong {
+                        pongBlock()
+                    }
+                    if let s = self {
+                        s.pongDelegate?.websocketDidReceivePong(s)
+                    }
+                })
+                
                 let step = Int(offset+numericCast(len))
                 let extra = bufferLen-step
                 if extra > 0 {
@@ -595,19 +593,23 @@ public class WebSocket : NSObject, NSStreamDelegate {
                     writeError(CloseCode.Encoding.rawValue)
                     return false
                 }
-                dispatch_async(queue,{
-                    if let textBlock = self.receivedTextBlock{
+                dispatch_async(queue,{ [weak self] in
+                    if let textBlock = self?.onText {
                         textBlock(str! as! String)
                     }
-                    self.delegate?.websocketDidReceiveMessage(self, text: str! as! String)
+                    if let s = self {
+                        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(queue,{
-                    if let dataBlock = self.receivedDataBlock{
+                dispatch_async(queue,{ [weak self] in
+                    if let dataBlock = self?.onData {
                         dataBlock(data)
                     }
-                    self.delegate?.websocketDidReceiveData(self, data: data)
+                    if let s = self {
+                        s.delegate?.websocketDidReceiveData(s, data: data)
+                    }
                 })
             }
             readStack.removeLast()
@@ -632,89 +634,83 @@ public class WebSocket : NSObject, NSStreamDelegate {
     }
     ///used to write things to the stream
     private func dequeueWrite(data: NSData, code: OpCode) {
+        if !self.connected {
+            return
+        }
         if writeQueue == nil {
             writeQueue = NSOperationQueue()
             writeQueue!.maxConcurrentOperationCount = 1
         }
-        writeQueue!.addOperationWithBlock {
-            //stream isn't ready, let's wait
-            var tries = 0;
-            while self.outputStream == nil || !self.connected {
-                if(tries < 5) {
-                    sleep(1);
+        writeQueue!.addOperationWithBlock { [weak self] in
+            if let s = self {
+                var offset = 2
+                let bytes = UnsafeMutablePointer<UInt8>(data.bytes)
+                let dataLength = data.length
+                let frame = NSMutableData(capacity: dataLength + s.MaxFrameSize)
+                let buffer = UnsafeMutablePointer<UInt8>(frame!.mutableBytes)
+                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).bigEndian
+                    offset += sizeof(UInt16)
                 } else {
-                    break;
+                    buffer[1] = 127
+                    var sizeBuffer = UnsafeMutablePointer<UInt64>((buffer+offset))
+                    sizeBuffer[0] = UInt64(dataLength).bigEndian
+                    offset += sizeof(UInt64)
                 }
-                tries++;
-            }
-            if !self.connected {
-                return
-            }
-            var offset = 2
-            UINT16_MAX
-            let bytes = UnsafeMutablePointer<UInt8>(data.bytes)
-            let dataLength = data.length
-            let frame = NSMutableData(capacity: dataLength + self.MaxFrameSize)
-            let buffer = UnsafeMutablePointer<UInt8>(frame!.mutableBytes)
-            buffer[0] = self.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).bigEndian
-                offset += sizeof(UInt16)
-            } else {
-                buffer[1] = 127
-                var 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, Int(sizeof(UInt32)), maskKey)
-            offset += sizeof(UInt32)
-            
-            for (var i = 0; i < dataLength; i++) {
-                buffer[offset] = bytes[i] ^ maskKey[i % sizeof(UInt32)]
-                offset += 1
-            }
-            var total = 0
-            while true {
-                if self.outputStream == nil {
-                    break
+                buffer[1] |= s.MaskMask
+                var maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
+                SecRandomCopyBytes(kSecRandomDefault, Int(sizeof(UInt32)), maskKey)
+                offset += sizeof(UInt32)
+                
+                for (var i = 0; i < dataLength; i++) {
+                    buffer[offset] = bytes[i] ^ maskKey[i % sizeof(UInt32)]
+                    offset += 1
                 }
-                let writeBuffer = UnsafePointer<UInt8>(frame!.bytes+total)
-                var len = self.outputStream?.write(writeBuffer, maxLength: offset-total)
-                if len == nil || len! < 0 {
-                    var error: NSError?
-                    if let streamError = self.outputStream?.streamError {
-                        error = streamError
-                    } else {
-                        let errCode = InternalErrorCode.OutputStreamWriteError.rawValue
-                        error = self.errorWithDetail("output stream error during write", code: errCode)
+                var total = 0
+                while true {
+                    if !s.isConnected || s.outputStream == nil {
+                        break
+                    }
+                    let writeBuffer = UnsafePointer<UInt8>(frame!.bytes+total)
+                    var len = s.outputStream?.write(writeBuffer, maxLength: offset-total)
+                    if len == nil || len! < 0 {
+                        var error: NSError?
+                        if let streamError = s.outputStream?.streamError {
+                            error = streamError
+                        } else {
+                            let errCode = InternalErrorCode.OutputStreamWriteError.rawValue
+                            error = s.errorWithDetail("output stream error during write", code: errCode)
+                        }
+                        s.doDisconnect(error)
+                        break
+                    } else {
+                        total += len!
+                    }
+                    if total >= offset {
+                        break
                     }
-                    self.doDisconnect(error)
-                    break
-                } else {
-                    total += len!
-                }
-                if total >= offset {
-                    break
                 }
+
             }
-            
         }
     }
     
     ///used to preform the disconnect delegate
     private func doDisconnect(error: NSError?) {
-        if self.isConnected {
-            dispatch_async(queue,{
-                if let disconnect = self.disconnectedBlock {
+        if !self.didDisconnect {
+            dispatch_async(queue,{ [weak self] in
+                self?.didDisconnect = true
+                if let disconnect = self?.onDisconnect {
                     disconnect(error)
                 }
-                self.delegate?.websocketDidDisconnect(self, error: error)
+                if let s = self {
+                    s.delegate?.websocketDidDisconnect(s, error: error)
+                }
             })
         }
     }

examples/AutobahnTest/.gitignore

@@ -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

examples/AutobahnTest/Autobahn.xcodeproj/project.pbxproj

@@ -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 */;
+}

examples/AutobahnTest/Autobahn.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Autobahn.xcodeproj">
+   </FileRef>
+</Workspace>

examples/AutobahnTest/Autobahn/AppDelegate.swift

@@ -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:.
+    }
+
+
+}
+

examples/AutobahnTest/Autobahn/Base.lproj/LaunchScreen.xib

@@ -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>

examples/AutobahnTest/Autobahn/Base.lproj/Main.storyboard

@@ -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>

examples/AutobahnTest/Autobahn/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -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"
+  }
+}

examples/AutobahnTest/Autobahn/Info.plist

@@ -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>

examples/AutobahnTest/Autobahn/ViewController.swift

@@ -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.
+    }
+
+
+}
+

examples/AutobahnTest/AutobahnTests/AutobahnTests.swift

@@ -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.
+        }
+    }
+    
+}

examples/AutobahnTest/AutobahnTests/Info.plist

@@ -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>

examples/SimpleTest/.gitignore

@@ -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

examples/SimpleTest/SimpleTest.xcodeproj/project.pbxproj

@@ -164,6 +164,7 @@
 		5C765AD3199A6DAA003D9110 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = vluxe;
 				TargetAttributes = {

examples/SimpleTest/SimpleTest.xcodeproj/project.xcworkspace/xcshareddata/SimpleTest.xccheckout

@@ -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>

examples/SimpleTest/SimpleTest/ViewController.swift

@@ -27,6 +27,8 @@ class ViewController: UIViewController, WebSocketDelegate {
     func websocketDidDisconnect(ws: WebSocket, error: NSError?) {
         if let e = error {
             println("websocket is disconnected: \(e.localizedDescription)")
+        } else {
+             println("websocket disconnected")
         }
     }