Merge branch 'master' of https://github.com/daltoniam/Starscream

a few small bug fixes and swift 4.1 support
Merge pull request #461 from rastersize/remove-cartfile
2018-04-04 13:16:29 -05:00 · 2018-04-04 13:16:20 -05:00 · 2018-02-19 17:22:33 -06:00 · 2018-01-30 18:04:11 -05:00 · 2018-01-13 19:14:22 -06:00 · 2018-01-13 18:56:36 -06:00
27 changed files with 2237 additions and 1963 deletions
@@ -1 +1 @@
-3.0
+4.1
@@ -2,6 +2,160 @@
 All notable changes to this project will be documented in this file.
 `Starscream` adheres to [Semantic Versioning](http://semver.org/).

+#### [3.0.5](https://github.com/daltoniam/Starscream/tree/3.0.5)
+
+Swift 4.1 support and bug fixes.
+
+Pull Requests:
+[#492](https://github.com/daltoniam/Starscream/pull/492)
+[#461](https://github.com/daltoniam/Starscream/pull/461)
+[#476](https://github.com/daltoniam/Starscream/pull/476)
+
+Issues:
+[#494](https://github.com/daltoniam/Starscream/issues/494)
+[#491](https://github.com/daltoniam/Starscream/issues/491)
+[#474](https://github.com/daltoniam/Starscream/issues/474)
+[#471](https://github.com/daltoniam/Starscream/issues/471)
+[#437](https://github.com/daltoniam/Starscream/issues/437)
+[#445](https://github.com/daltoniam/Starscream/issues/445)
+[#466](https://github.com/daltoniam/Starscream/issues/466)
+
+
+#### [3.0.4](https://github.com/daltoniam/Starscream/tree/3.0.4)
+
+Improved error handling. Timeout fix. Small assorted fixes.
+
+Pull Requests:
+[#452](https://github.com/daltoniam/Starscream/pull/452)
+[#448](https://github.com/daltoniam/Starscream/pull/448)
+[#444](https://github.com/daltoniam/Starscream/pull/444)
+[#443](https://github.com/daltoniam/Starscream/pull/443)
+
+Issues:
+[#415](https://github.com/daltoniam/Starscream/issues/415)
+[#422](https://github.com/daltoniam/Starscream/issues/422)
+[#429](https://github.com/daltoniam/Starscream/issues/429)
+[#433](https://github.com/daltoniam/Starscream/issues/433)
+[#439](https://github.com/daltoniam/Starscream/issues/439)
+
+#### [3.0.3](https://github.com/daltoniam/Starscream/tree/3.0.3)
+
+Assorted fixes.
+
+Pull Requests:
+[#438](https://github.com/daltoniam/Starscream/pull/438)
+[#423](https://github.com/daltoniam/Starscream/pull/423)
+[#420](https://github.com/daltoniam/Starscream/pull/420)
+[#418](https://github.com/daltoniam/Starscream/pull/418)
+[#410](https://github.com/daltoniam/Starscream/pull/410)
+[#405](https://github.com/daltoniam/Starscream/pull/405)
+[#404](https://github.com/daltoniam/Starscream/pull/404)
+[#400](https://github.com/daltoniam/Starscream/pull/400)
+
+Issues:
+[#435](https://github.com/daltoniam/Starscream/issues/435)
+[#431](https://github.com/daltoniam/Starscream/issues/431)
+[#426](https://github.com/daltoniam/Starscream/issues/426)
+[#409](https://github.com/daltoniam/Starscream/issues/409)
+[#408](https://github.com/daltoniam/Starscream/issues/408)
+[#401](https://github.com/daltoniam/Starscream/issues/401)
+[#399](https://github.com/daltoniam/Starscream/issues/399)
+[#378](https://github.com/daltoniam/Starscream/issues/378)
+
+#### [3.0.2](https://github.com/daltoniam/Starscream/tree/3.0.2)
+
+Small fixes for 3.0.1.
+
+[#394](https://github.com/daltoniam/Starscream/issues/394)
+[#392](https://github.com/daltoniam/Starscream/issues/392)
+[#391](https://github.com/daltoniam/Starscream/issues/391)
+
+#### [3.0.1](https://github.com/daltoniam/Starscream/tree/3.0.1)
+
+Small fixes for 3.0.0.
+
+[#389](https://github.com/daltoniam/Starscream/issues/389)
+[#354](https://github.com/daltoniam/Starscream/issues/354)
+[#386](https://github.com/daltoniam/Starscream/pull/386)
+[#388](https://github.com/daltoniam/Starscream/pull/388)
+[#390](https://github.com/daltoniam/Starscream/pull/390)
+
+#### [3.0.0](https://github.com/daltoniam/Starscream/tree/3.0.0)
+
+Major refactor and Swift 4 support. Additions include:
+
+- Watchos support.
+- Linux support.
+- New Stream class to allow custom socket implementations if desired.
+- Protocol added for mocking (dependency injection).
+- Single framework (no more platform suffixes! e.g. StarscreamOSX, StarscreamTVOS, etc).
+
+[#384](https://github.com/daltoniam/Starscream/issues/384)
+[#377](https://github.com/daltoniam/Starscream/pull/377)
+[#374](https://github.com/daltoniam/Starscream/issues/374)
+[#346](https://github.com/daltoniam/Starscream/issues/346)
+[#335](https://github.com/daltoniam/Starscream/issues/335)
+[#311](https://github.com/daltoniam/Starscream/pull/311)
+[#269](https://github.com/daltoniam/Starscream/issues/269)
+
+#### [2.1.1](https://github.com/daltoniam/Starscream/tree/2.1.1)
+
+Fixes race condition. Updated to avoid SPM dependencies.
+
+[#370](https://github.com/daltoniam/Starscream/issues/370)
+[#367](https://github.com/daltoniam/Starscream/issues/367)
+[#364](https://github.com/daltoniam/Starscream/pull/364)
+[#357](https://github.com/daltoniam/Starscream/pull/357)
+[#355](https://github.com/daltoniam/Starscream/pull/355)
+
+#### [2.1.0](https://github.com/daltoniam/Starscream/tree/2.1.0)
+
+Adds WebSocket compression. Also adds advance WebSocket delegate for extra control. Bug Fixes.
+
+[#349](https://github.com/daltoniam/Starscream/pull/349)
+[#344](https://github.com/daltoniam/Starscream/pull/344)
+[#339](https://github.com/daltoniam/Starscream/pull/339)
+[#337](https://github.com/daltoniam/Starscream/pull/337)
+[#334](https://github.com/daltoniam/Starscream/issues/334)
+[#333](https://github.com/daltoniam/Starscream/pull/333)
+[#319](https://github.com/daltoniam/Starscream/issues/319)
+[#309](https://github.com/daltoniam/Starscream/issues/309)
+[#329](https://github.com/daltoniam/Starscream/issues/329)
+
+#### [2.0.4](https://github.com/daltoniam/Starscream/tree/2.0.4)
+
+SSL Pinning fix by Giuliano Galea as reported by Lukas Futera of [Centralway](https://www.centralway.com/de/).
+Warning fixes for Swift 3.1
+
+#### [2.0.3](https://github.com/daltoniam/Starscream/tree/2.0.3)
+
+[#302](https://github.com/daltoniam/Starscream/issues/302)
+[#301](https://github.com/daltoniam/Starscream/issues/301)
+[#300](https://github.com/daltoniam/Starscream/issues/300)
+[#296](https://github.com/daltoniam/Starscream/issues/296)
+[#294](https://github.com/daltoniam/Starscream/issues/294)
+[#292](https://github.com/daltoniam/Starscream/issues/292)
+[#289](https://github.com/daltoniam/Starscream/issues/289)
+[#288](https://github.com/daltoniam/Starscream/issues/288)
+
+#### [2.0.2](https://github.com/daltoniam/Starscream/tree/2.0.2)
+
+Fix for the Swift Package Manager.
+
+Fixed: 
+[#277](https://github.com/daltoniam/Starscream/issues/277)
+
+#### [2.0.1](https://github.com/daltoniam/Starscream/tree/2.0.1)
+
+Bug fixes.
+
+Fixed: 
+[#261](https://github.com/daltoniam/Starscream/issues/261)
+[#276](https://github.com/daltoniam/Starscream/issues/276)
+[#267](https://github.com/daltoniam/Starscream/issues/267)
+[#266](https://github.com/daltoniam/Starscream/issues/266)
+[#259](https://github.com/daltoniam/Starscream/issues/259)
+
 #### [2.0.0](https://github.com/daltoniam/Starscream/tree/2.0.0)

 Added Swift 3 support.
@@ -21,5 +21,12 @@
 import PackageDescription

 let package = Package(
-    name: "Starscream"
+    name: "Starscream",
+    dependencies: [
+        .Package(url: "https://github.com/daltoniam/zlib-spm.git",
+    majorVersion: 1, minor: 1),
+        .Package(url: "https://github.com/daltoniam/common-crypto-spm",
+                 majorVersion: 1, minor: 1),
+        ],
+    exclude: ["Tests", "examples"]
 )
@@ -1,20 +1,17 @@
 ![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.
+Starscream is a conforming WebSocket ([RFC 6455](http://tools.ietf.org/html/rfc6455)) client library in Swift.

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

 ## Features

 - Conforms to all of the base [Autobahn test suite](http://autobahn.ws/testsuite/).
 - Nonblocking. Everything happens in the background, thanks to GCD.
 - TLS/WSS support.
+- Compression Extensions support ([RFC 7692](https://tools.ietf.org/html/rfc7692))
 - Simple concise codebase at just a few hundred LOC.

-## Swift 2.3
-
-See release/tag 1.1.4 for Swift 2.3 support.
-
 ## Example

 First thing is to import the framework. See the Installation instructions on how to add the framework to your project.
@@ -38,7 +35,7 @@ After you are connected, there are some delegate methods that we need to impleme
 websocketDidConnect is called as soon as the client connects to the server.

 ```swift
-func websocketDidConnect(socket: WebSocket) {
+func websocketDidConnect(socket: WebSocketClient) {
    print("websocket is connected")
 }
 ```
@@ -48,7 +45,7 @@ func websocketDidConnect(socket: WebSocket) {
 websocketDidDisconnect is called as soon as the client is disconnected from the server.

 ```swift
-func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
+func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
 	print("websocket is disconnected: \(error?.localizedDescription)")
 }
 ```
@@ -58,7 +55,7 @@ func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
 websocketDidReceiveMessage is called when the client gets a text frame from the connection.

 ```swift
-func websocketDidReceiveMessage(socket: WebSocket, text: String) {
+func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
 	print("got some text: \(text)")
 }
 ```
@@ -68,7 +65,7 @@ func websocketDidReceiveMessage(socket: WebSocket, text: String) {
 websocketDidReceiveData is called when the client gets a binary frame from the connection.

 ```swift
-func websocketDidReceiveData(socket: WebSocket, data: Data) {
+func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
 	print("got some data: \(data.count)")
 }
 ```
@@ -78,7 +75,7 @@ func websocketDidReceiveData(socket: WebSocket, data: Data) {
 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, data: Data?) {
+func websocketDidReceivePong(socket: WebSocketClient, data: Data?) {
 	print("Got pong! Maybe some data: \(data?.count)")
 }
 ```
@@ -92,7 +89,7 @@ socket.onConnect = {
    print("websocket is connected")
 }
 //websocketDidDisconnect
-socket.onDisconnect = { (error: NSError?) in
+socket.onDisconnect = { (error: Error?) in
    print("websocket is disconnected: \(error?.localizedDescription)")
 }
 //websocketDidReceiveMessage
@@ -107,7 +104,7 @@ socket.onData = { (data: Data) in
 socket.connect()
 ```

-One more: you can listen to socket connection and disconnection via notifications. Starscream posts `WebsocketDidConnectNotification` and `WebsocketDidDisconnectNotification`. You can find an `NSError` that caused the disconection by accessing `WebsocketDisconnectionErrorKeyName` on notification `userInfo`.
+One more: you can listen to socket connection and disconnection via notifications. Starscream posts `WebsocketDidConnectNotification` and `WebsocketDidDisconnectNotification`. You can find an `Error` that caused the disconection by accessing `WebsocketDisconnectionErrorKeyName` on notification `userInfo`.


 ## The delegate methods give you a simple way to handle data from the server, but how do you send data?
@@ -136,6 +133,25 @@ The writePing method is the same as write, but sends a ping control frame.
 socket.write(ping: Data()) //example on how to write a ping control frame over the socket!
 ```

+### write a pong frame
+
+
+the writePong method is the same as writePing, but sends a pong control frame.
+
+```swift
+socket.write(pong: Data()) //example on how to write a pong control frame over the socket!
+```
+
+Starscream will automatically respond to incoming `ping` control frames so you do not need to manually send `pong`s.
+
+However if for some reason you need to control this prosses you can turn off the automatic `ping` response by disabling `respondToPingWithPong`.
+
+```swift
+socket.respondToPingWithPong = false //Do not automaticaly respond to incoming pings with pongs.
+```
+
+In most cases you will not need to do this.
+
 ### disconnect

 The disconnect method does what you would expect and closes the socket.
@@ -159,9 +175,23 @@ if socket.isConnected {
 You can also override the default websocket headers with your own custom ones like so:

 ```swift
-socket.headers["Sec-WebSocket-Protocol"] = "someother protocols"
-socket.headers["Sec-WebSocket-Version"] = "14"
-socket.headers["My-Awesome-Header"] = "Everything is Awesome!"
+var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
+request.timeoutInterval = 5
+request.setValue("someother protocols", forHTTPHeaderField: "Sec-WebSocket-Protocol")
+request.setValue("14", forHTTPHeaderField: "Sec-WebSocket-Version")
+request.setValue("Everything is Awesome!", forHTTPHeaderField: "My-Awesome-Header")
+let socket = WebSocket(request: request)
+```
+
+### Custom HTTP Method
+
+Your server may use a different HTTP method when connecting to the websocket:
+
+```swift
+var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
+request.httpMethod = "POST"
+request.timeoutInterval = 5
+let socket = WebSocket(request: request)
 ```

 ### Protocols
@@ -175,23 +205,18 @@ socket.delegate = self
 socket.connect()
 ```

-### Self Signed SSL and VOIP
-
-There are a couple of other properties that modify the stream:
+### Self Signed SSL

 ```swift
 socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, 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
-
-//set this you want to ignore SSL cert validation, so a self signed SSL certificate can be used.
+//set this if you want to ignore SSL cert validation, so a self signed SSL certificate can be used.
 socket.disableSSLCertValidation = true
 ```

 ### SSL Pinning

-SSL Pinning is also supported in Starscream. 
+SSL Pinning is also supported in Starscream.

 ```swift
 socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
@@ -201,6 +226,30 @@ socket.security = SSLSecurity(certs: [SSLCert(data: data)], usePublicKeys: true)
 ```
 You load either a `Data` 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.

+### SSL Cipher Suites
+
+To use an SSL encrypted connection, you need to tell Starscream about the cipher suites your server supports. 
+
+```swift
+socket = WebSocket(url: URL(string: "wss://localhost:8080/")!, protocols: ["chat","superchat"])
+
+// Set enabled cipher suites to AES 256 and AES 128
+socket.enabledSSLCipherSuites = [TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256] 
+```
+
+If you don't know which cipher suites are supported by your server, you can try pointing [SSL Labs](https://www.ssllabs.com/ssltest/) at it and checking the results.
+
+### Compression Extensions
+
+Compression Extensions ([RFC 7692](https://tools.ietf.org/html/rfc7692)) is supported in Starscream.  Compression is enabled by default, however compression will only be used if it is supported by the server as well.  You may enable or disable compression via the `.enableCompression` property:
+
+```swift
+socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
+socket.enableCompression = false
+```
+
+Compression should be disabled if your application is transmitting already-compressed, random, or other uncompressable data.
+
 ### Custom Queue

 A custom queue can be specified when delegate methods are called. By default `DispatchQueue.main` 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.
@@ -231,7 +280,7 @@ To use Starscream in your project add the following 'Podfile' to your project
 	platform :ios, '9.0'
 	use_frameworks!

-	pod 'Starscream', '~> 2.0.0'
+	pod 'Starscream', '~> 3.0.2'

 Then run:

@@ -253,7 +302,7 @@ $ brew install carthage
 To integrate Starscream into your Xcode project using Carthage, specify it in your `Cartfile`:

 ```
-github "daltoniam/Starscream" >= 2.0.0
+github "daltoniam/Starscream" >= 3.0.2
 ```

 ### Rogue
@@ -263,11 +312,23 @@ First see the [installation docs](https://github.com/acmacalister/Rogue) for how
 To install Starscream run the command below in the directory you created the rogue file.

 ```
-rogue add https://github.com/daltoniam/starscream
+rogue add https://github.com/daltoniam/Starscream
 ```

 Next open the `libs` folder and add the `Starscream.xcodeproj` to your Xcode project. Once that is complete, in your "Build Phases" add the `Starscream.framework` to your "Link Binary with Libraries" phase. Make sure to add the `libs` folder to your `.gitignore` file.

+### Swift Package Manager
+
+The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler.
+
+Once you have your Swift package set up, adding Starscream as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
+
+```swift
+dependencies: [
+    .Package(url: "https://github.com/daltoniam/Starscream.git", majorVersion: 3)
+]
+```
+
 ### Other

 Simply grab the framework (either via git submodule or another package manager).
@@ -278,11 +339,54 @@ 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.

+
+## WebSocketAdvancedDelegate
+The advanced delegate acts just like the simpler delegate but provides some additional information on the connection and incoming frames.
+
+```swift
+socket.advancedDelegate = self
+```
+
+In most cases you do not need the extra info and should use the normal delegate.
+
+#### websocketDidReceiveMessage
+```swift
+func websocketDidReceiveMessage(socket: WebSocketClient, text: String, response: WebSocket.WSResponse) {
+	print("got some text: \(text)")
+	print("First frame for this message arrived on \(response.firstFrame)")
+}
+```
+
+#### websocketDidReceiveData
+```swift
+func websocketDidReceiveData(socket: WebSocketClient, data: Date, response: WebSocket.WSResponse) {
+	print("got some data it long: \(data.count)")
+	print("A total of \(response.frameCount) frames were used to send this data")
+}
+```
+
+#### websocketHttpUpgrade
+These methods are called when the HTTP upgrade request is sent and when the response returns.
+```swift
+func  websocketHttpUpgrade(socket: WebSocketClient, request: CFHTTPMessage) {
+	print("the http request was sent we can check the raw http if we need to")
+}
+```
+
+```swift
+func  websocketHttpUpgrade(socket: WebSocketClient, response: CFHTTPMessage) {
+	print("the http response has returned.")
+}
+```
+
+## KNOWN ISSUES
+- WatchOS does not have the the CFNetwork String constants to modify the stream's SSL behavior. It will be the default Foundation SSL behavior. This means watchOS CANNOT use `SSLCiphers`,  `disableSSLCertValidation`, or SSL pinning. All these values set on watchOS will do nothing. 
+- Linux does not have the security framework, so it CANNOT use SSL pinning or `SSLCiphers` either. 
+
+
 ## TODOs

- [ ] WatchOS?
- [ ] Linux Support?
- [ ] Add Unit Tests - Local Swift websocket server
+- [ ] Add Unit Tests - Local WebSocket server that runs against Autobahn

 ## License

@@ -1,30 +0,0 @@
-<?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>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-</dict>
-</plist>
@@ -1,938 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  Websocket.swift
-//
-//  Created by Dalton Cherry on 7/16/14.
-//  Copyright (c) 2014-2016 Dalton Cherry.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-import Foundation
-import CoreFoundation
-import Security
-
-public let WebsocketDidConnectNotification = "WebsocketDidConnectNotification"
-public let WebsocketDidDisconnectNotification = "WebsocketDidDisconnectNotification"
-public let WebsocketDisconnectionErrorKeyName = "WebsocketDisconnectionErrorKeyName"
-
-public protocol WebSocketDelegate: class {
-    func websocketDidConnect(socket: WebSocket)
-    func websocketDidDisconnect(socket: WebSocket, error: NSError?)
-    func websocketDidReceiveMessage(socket: WebSocket, text: String)
-    func websocketDidReceiveData(socket: WebSocket, data: Data)
-}
-
-public protocol WebSocketPongDelegate: class {
-    func websocketDidReceivePong(socket: WebSocket, data: Data?)
-}
-
-public class WebSocket : NSObject, StreamDelegate {
-    
-    enum OpCode : UInt8 {
-        case continueFrame = 0x0
-        case textFrame = 0x1
-        case binaryFrame = 0x2
-        // 3-7 are reserved.
-        case connectionClose = 0x8
-        case ping = 0x9
-        case pong = 0xA
-        // B-F reserved.
-    }
-    
-    public enum CloseCode : UInt16 {
-        case normal                 = 1000
-        case goingAway              = 1001
-        case protocolError          = 1002
-        case protocolUnhandledType  = 1003
-        // 1004 reserved.
-        case noStatusReceived       = 1005
-        //1006 reserved.
-        case encoding               = 1007
-        case policyViolated         = 1008
-        case messageTooBig          = 1009
-    }
-
-    public static let ErrorDomain = "WebSocket"
-
-    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 callbackQueue = DispatchQueue.main
-
-    var optionalProtocols: [String]?
-
-    // MARK: - Constants
-
-    let headerWSUpgradeName     = "Upgrade"
-    let headerWSUpgradeValue    = "websocket"
-    let headerWSHostName        = "Host"
-    let headerWSConnectionName  = "Connection"
-    let headerWSConnectionValue = "Upgrade"
-    let headerWSProtocolName    = "Sec-WebSocket-Protocol"
-    let headerWSVersionName     = "Sec-WebSocket-Version"
-    let headerWSVersionValue    = "13"
-    let headerWSKeyName         = "Sec-WebSocket-Key"
-    let headerOriginName        = "Origin"
-    let headerWSAcceptName      = "Sec-WebSocket-Accept"
-    let BUFFER_MAX              = 4096
-    let FinMask: UInt8          = 0x80
-    let OpCodeMask: UInt8       = 0x0F
-    let RSVMask: UInt8          = 0x70
-    let MaskMask: UInt8         = 0x80
-    let PayloadLenMask: UInt8   = 0x7F
-    let MaxFrameSize: Int       = 32
-    let httpSwitchProtocolCode  = 101
-    let supportedSSLSchemes     = ["wss", "https"]
-
-    class WSResponse {
-        var isFin = false
-        var code: OpCode = .continueFrame
-        var bytesLeft = 0
-        var frameCount = 0
-        var buffer: NSMutableData?
-    }
-
-    // MARK: - Delegates
-
-    /// Responds to callback about new messages coming in over the WebSocket
-    /// and also connection/disconnect messages.
-    public weak var delegate: WebSocketDelegate?
-
-    /// Receives a callback for each pong message recived.
-    public weak var pongDelegate: WebSocketPongDelegate?
-
-
-    // MARK: - Block based API.
-
-    public var onConnect: ((Void) -> Void)?
-    public var onDisconnect: ((NSError?) -> Void)?
-    public var onText: ((String) -> Void)?
-    public var onData: ((Data) -> Void)?
-    public var onPong: ((Data?) -> Void)?
-
-    public var headers = [String: String]()
-    public var voipEnabled = false
-    public var disableSSLCertValidation = false
-    public var security: SSLSecurity?
-    public var enabledSSLCipherSuites: [SSLCipherSuite]?
-    public var origin: String?
-    public var timeout = 5
-    public var isConnected: Bool {
-        return connected
-    }
-    
-    public var currentURL: URL { return url }
-
-    // MARK: - Private
-
-    private var url: URL
-    private var inputStream: InputStream?
-    private var outputStream: OutputStream?
-    private var connected = false
-    private var isConnecting = false
-    private var writeQueue = OperationQueue()
-    private var readStack = [WSResponse]()
-    private var inputQueue = [Data]()
-    private var fragBuffer: Data?
-    private var certValidated = false
-    private var didDisconnect = false
-    private var readyToWrite = false
-    private let mutex = NSLock()
-    private let notificationCenter = NotificationCenter.default
-    private var canDispatch: Bool {
-        mutex.lock()
-        let canWork = readyToWrite
-        mutex.unlock()
-        return canWork
-    }
-    /// The shared processing queue used for all WebSocket.
-    private static let sharedWorkQueue = DispatchQueue(label: "com.vluxe.starscream.websocket", attributes: [])
-    
-    /// Used for setting protocols.
-    public init(url: URL, protocols: [String]? = nil) {
-        self.url = url
-        self.origin = url.absoluteString
-        writeQueue.maxConcurrentOperationCount = 1
-        optionalProtocols = protocols
-    }
-    
-    // Used for specifically setting the QOS for the write queue.
-    public convenience init(url: URL, writeQueueQOS: QualityOfService, protocols: [String]? = nil) {
-        self.init(url: url, protocols: protocols)
-        writeQueue.qualityOfService = writeQueueQOS
-    }
-
-    /**
-     Connect to the WebSocket server on a background thread.
-     */
-    public func connect() {
-        guard !isConnecting else { return }
-        didDisconnect = false
-        isConnecting = true
-        createHTTPRequest()
-        isConnecting = false
-    }
-
-    /**
-     Disconnect from the server. I send a Close control frame to the server, then expect the server to respond with a Close control frame and close the socket from its end. I notify my delegate once the socket has been closed.
-
-     If you supply a non-nil `forceTimeout`, I wait at most that long (in seconds) for the server to close the socket. After the timeout expires, I close the socket and notify my delegate.
-
-     If you supply a zero (or negative) `forceTimeout`, I immediately close the socket (without sending a Close control frame) and notify my delegate.
-
-     - Parameter forceTimeout: Maximum time to wait for the server to close the socket.
-     - Parameter closeCode: The code to send on disconnect. The default is the normal close code for cleanly disconnecting a webSocket.
-    */
-    public func disconnect(forceTimeout: TimeInterval? = nil, closeCode: UInt16 = CloseCode.normal.rawValue) {
-        switch forceTimeout {
-        case .some(let seconds) where seconds > 0:
-            callbackQueue.asyncAfter(deadline: DispatchTime.now() + Double(Int64(seconds * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)) { [weak self] in
-                self?.disconnectStream(nil)
-            }
-            fallthrough
-        case .none:
-            writeError(closeCode)
-        default:
-            disconnectStream(nil)
-            break
-        }
-    }
-
-    /**
-     Write a string to the websocket. This sends it as a text frame.
-
-     If you supply a non-nil completion block, I will perform it when the write completes.
-
-     - parameter str:        The string to write.
-     - parameter completion: The (optional) completion handler.
-     */
-    public func write(string: String, completion: (() -> ())? = nil) {
-        guard isConnected else { return }
-        dequeueWrite(string.data(using: String.Encoding.utf8)!, code: .textFrame, writeCompletion: completion)
-    }
-
-    /**
-     Write binary data to the websocket. This sends it as a binary frame.
-
-     If you supply a non-nil completion block, I will perform it when the write completes.
-
-     - parameter data:       The data to write.
-     - parameter completion: The (optional) completion handler.
-     */
-    public func write(data: Data, completion: (() -> ())? = nil) {
-        guard isConnected else { return }
-        dequeueWrite(data, code: .binaryFrame, writeCompletion: completion)
-    }
-    
-    /**
-     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 write(ping: Data, completion: (() -> ())? = nil) {
-        guard isConnected else { return }
-        dequeueWrite(ping, code: .ping, writeCompletion: completion)
-    }
-
-    /**
-     Private method that starts the connection.
-     */
-    private func createHTTPRequest() {
-
-        let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET" as CFString,
-                                                    url as CFURL, kCFHTTPVersion1_1).takeRetainedValue()
-
-        var port = url.port
-        if port == nil {
-            if supportedSSLSchemes.contains(url.scheme!) {
-                port = 443
-            } else {
-                port = 80
-            }
-        }
-        addHeader(urlRequest, key: headerWSUpgradeName, val: headerWSUpgradeValue)
-        addHeader(urlRequest, key: headerWSConnectionName, val: headerWSConnectionValue)
-        if let protocols = optionalProtocols {
-            addHeader(urlRequest, key: headerWSProtocolName, val: protocols.joined(separator: ","))
-        }
-        addHeader(urlRequest, key: headerWSVersionName, val: headerWSVersionValue)
-        addHeader(urlRequest, key: headerWSKeyName, val: generateWebSocketKey())
-        if let origin = origin {
-            addHeader(urlRequest, key: headerOriginName, val: origin)
-        }
-        addHeader(urlRequest, key: headerWSHostName, val: "\(url.host!):\(port!)")
-        for (key, value) in headers {
-            addHeader(urlRequest, key: key, val: value)
-        }
-        if let cfHTTPMessage = CFHTTPMessageCopySerializedMessage(urlRequest) {
-            let serializedRequest = cfHTTPMessage.takeRetainedValue()
-            initStreamsWithData(serializedRequest as Data, Int(port!))
-        }
-    }
-    
-    /**
-     Add a header to the CFHTTPMessage by using the NSString bridges to CFString
-     */
-    private func addHeader(_ urlRequest: CFHTTPMessage, key: String, val: String) {
-        CFHTTPMessageSetHeaderFieldValue(urlRequest, key as CFString, val as CFString)
-    }
-
-    /**
-     Generate a WebSocket key as needed in RFC.
-     */
-    private func generateWebSocketKey() -> String {
-        var key = ""
-        let seed = 16
-        for _ in 0..<seed {
-            let uni = UnicodeScalar(UInt32(97 + arc4random_uniform(25)))
-            key += "\(Character(uni!))"
-        }
-        let data = key.data(using: String.Encoding.utf8)
-        let baseKey = data?.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0))
-        return baseKey!
-    }
-    
-    /**
-     Start the stream connection and write the data to the output stream.
-     */
-    private func initStreamsWithData(_ data: Data, _ port: Int) {
-        //higher level API we will cut over to at some point
-        //NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream)
-
-        var readStream: Unmanaged<CFReadStream>?
-        var writeStream: Unmanaged<CFWriteStream>?
-        let h = url.host! as NSString
-        CFStreamCreatePairWithSocketToHost(nil, h, UInt32(port), &readStream, &writeStream)
-        inputStream = readStream!.takeRetainedValue()
-        outputStream = writeStream!.takeRetainedValue()
-        guard let inStream = inputStream, let outStream = outputStream else { return }
-        inStream.delegate = self
-        outStream.delegate = self
-        if supportedSSLSchemes.contains(url.scheme!) {
-            inStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL as AnyObject, forKey: Stream.PropertyKey.socketSecurityLevelKey)
-            outStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL as AnyObject, forKey: Stream.PropertyKey.socketSecurityLevelKey)
-        } else {
-            certValidated = true //not a https session, so no need to check SSL pinning
-        }
-        if voipEnabled {
-            inStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType)
-            outStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType)
-        }
-        if disableSSLCertValidation {
-            let settings: [NSObject: NSObject] = [kCFStreamSSLValidatesCertificateChain: NSNumber(value: false), kCFStreamSSLPeerName: kCFNull]
-            inStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey)
-            outStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey)
-        }
-        if let cipherSuites = self.enabledSSLCipherSuites {
-            if let sslContextIn = CFReadStreamCopyProperty(inputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext?,
-                let sslContextOut = CFWriteStreamCopyProperty(outputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext? {
-                let resIn = SSLSetEnabledCiphers(sslContextIn, cipherSuites, cipherSuites.count)
-                let resOut = SSLSetEnabledCiphers(sslContextOut, cipherSuites, cipherSuites.count)
-                if resIn != errSecSuccess {
-                    let error = self.errorWithDetail("Error setting ingoing cypher suites", code: UInt16(resIn))
-                    disconnectStream(error)
-                    return
-                }
-                if resOut != errSecSuccess {
-                    let error = self.errorWithDetail("Error setting outgoing cypher suites", code: UInt16(resOut))
-                    disconnectStream(error)
-                    return
-                }
-            }
-        }
-        
-        CFReadStreamSetDispatchQueue(inStream, WebSocket.sharedWorkQueue)
-        CFWriteStreamSetDispatchQueue(outStream, WebSocket.sharedWorkQueue)
-        inStream.open()
-        outStream.open()
-
-        self.mutex.lock()
-        self.readyToWrite = true
-        self.mutex.unlock()
-        
-        let bytes = UnsafeRawPointer((data as NSData).bytes).assumingMemoryBound(to: UInt8.self)
-        var out = timeout * 1000000 // wait 5 seconds before giving up
-        writeQueue.addOperation { [weak self] in
-            while !outStream.hasSpaceAvailable {
-                usleep(100) // wait until the socket is ready
-                out -= 100
-                if out < 0 {
-                    self?.cleanupStream()
-                    self?.doDisconnect(self?.errorWithDetail("write wait timed out", code: 2))
-                    return
-                } else if outStream.streamError != nil {
-                    return // disconnectStream will be called.
-                }
-            }
-            outStream.write(bytes, maxLength: data.count)
-        }
-    }
-    
-    /**
-     Delegate for the stream methods. Processes incoming bytes
-     */
-    public func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
-        if let sec = security, !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) {
-            let trust = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) as AnyObject
-            let domain = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String
-            if sec.isValid(trust as! SecTrust, domain: domain) {
-                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 as NSError?)
-        } else if eventCode == .endEncountered {
-            disconnectStream(nil)
-        }
-    }
-    
-    /**
-     Disconnect the stream object and notifies the delegate.
-     */
-    private func disconnectStream(_ error: NSError?) {
-        if error == nil {
-            writeQueue.waitUntilAllOperationsAreFinished()
-        } else {
-            writeQueue.cancelAllOperations()
-        }
-        cleanupStream()
-        doDisconnect(error)
-    }
-
-    /**
-     cleanup the streams.
-     */
-    private func cleanupStream() {
-        outputStream?.delegate = nil
-        inputStream?.delegate = nil
-        if let stream = inputStream {
-            CFReadStreamSetDispatchQueue(stream, nil)
-            stream.close()
-        }
-        if let stream = outputStream {
-            CFWriteStreamSetDispatchQueue(stream, nil)
-            stream.close()
-        }
-        outputStream = nil
-        inputStream = nil
-    }
-
-    /**
-     Handles the incoming bytes and sending them to the proper processing method.
-     */
-    private func processInputStream() {
-        let buf = NSMutableData(capacity: BUFFER_MAX)
-        let buffer = UnsafeMutableRawPointer(mutating: buf!.bytes).assumingMemoryBound(to: UInt8.self)
-        let length = inputStream!.read(buffer, maxLength: BUFFER_MAX)
-
-        guard length > 0 else { return }
-        var process = false
-        if inputQueue.count == 0 {
-            process = true
-        }
-        inputQueue.append(Data(bytes: buffer, count: length))
-        if process {
-            dequeueInput()
-        }
-    }
-
-    /**
-     Dequeue the incoming input so it is processed in order.
-     */
-    private func dequeueInput() {
-        while !inputQueue.isEmpty {
-            let data = inputQueue[0]
-            var work = data
-            if let fragBuffer = fragBuffer {
-                var combine = NSData(data: fragBuffer) as Data
-                combine.append(data)
-                work = combine
-                self.fragBuffer = nil
-            }
-            let buffer = UnsafeRawPointer((work as NSData).bytes).assumingMemoryBound(to: UInt8.self)
-            let length = work.count
-            if !connected {
-                processTCPHandshake(buffer, bufferLen: length)
-            } else {
-                processRawMessagesInBuffer(buffer, bufferLen: length)
-            }
-            inputQueue = inputQueue.filter{ $0 != data }
-        }
-    }
-    
-    /**
-     Handle checking the inital connection status
-     */
-    private func processTCPHandshake(_ buffer: UnsafePointer<UInt8>, bufferLen: Int) {
-        let code = processHTTP(buffer, bufferLen: bufferLen)
-        switch code {
-        case 0:
-            connected = true
-            guard canDispatch else {return}
-            callbackQueue.async { [weak self] in
-                guard let s = self else { return }
-                s.onConnect?()
-                s.delegate?.websocketDidConnect(socket: s)
-                s.notificationCenter.post(name: NSNotification.Name(WebsocketDidConnectNotification), object: self)
-            }
-        case -1:
-            fragBuffer = Data(bytes: buffer, count: bufferLen)
-        break // do nothing, we are going to collect more data
-        default:
-            doDisconnect(errorWithDetail("Invalid HTTP upgrade", code: UInt16(code)))
-        }
-    }
-    
-    /**
-     Finds the HTTP Packet in the TCP stream, by looking for the CRLF.
-     */
-    private func processHTTP(_ buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Int {
-        let CRLFBytes = [UInt8(ascii: "\r"), UInt8(ascii: "\n"), UInt8(ascii: "\r"), UInt8(ascii: "\n")]
-        var k = 0
-        var totalSize = 0
-        for i in 0..<bufferLen {
-            if buffer[i] == CRLFBytes[k] {
-                k += 1
-                if k == 3 {
-                    totalSize = i + 1
-                    break
-                }
-            } else {
-                k = 0
-            }
-        }
-        if totalSize > 0 {
-            let code = validateResponse(buffer, bufferLen: totalSize)
-            if code != 0 {
-                return code
-            }
-            totalSize += 1 //skip the last \n
-            let restSize = bufferLen - totalSize
-            if restSize > 0 {
-                processRawMessagesInBuffer(buffer + totalSize, bufferLen: restSize)
-            }
-            return 0 //success
-        }
-        return -1 // Was unable to find the full TCP header.
-    }
-    
-    /**
-     Validates the HTTP is a 101 as per the RFC spec.
-     */
-    private func validateResponse(_ buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Int {
-        let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, false).takeRetainedValue()
-        CFHTTPMessageAppendBytes(response, buffer, bufferLen)
-        let code = CFHTTPMessageGetResponseStatusCode(response)
-        if code != httpSwitchProtocolCode {
-            return code
-        }
-        if let cfHeaders = CFHTTPMessageCopyAllHeaderFields(response) {
-            let headers = cfHeaders.takeRetainedValue() as NSDictionary
-            if let acceptKey = headers[headerWSAcceptName as NSString] as? NSString {
-                if acceptKey.length > 0 {
-                    return 0
-                }
-            }
-        }
-        return -1
-    }
-    
-    /**
-     Read a 16 bit big endian value from a buffer
-     */
-    private static func readUint16(_ buffer: UnsafePointer<UInt8>, offset: Int) -> UInt16 {
-        return (UInt16(buffer[offset + 0]) << 8) | UInt16(buffer[offset + 1])
-    }
-    
-    /**
-     Read a 64 bit big endian value from a buffer
-     */
-    private static func readUint64(_ buffer: UnsafePointer<UInt8>, offset: Int) -> UInt64 {
-        var value = UInt64(0)
-        for i in 0...7 {
-            value = (value << 8) | UInt64(buffer[offset + i])
-        }
-        return value
-    }
-    
-    /**
-     Write a 16-bit big endian value to a buffer.
-     */
-    private static func writeUint16(_ buffer: UnsafeMutablePointer<UInt8>, offset: Int, value: UInt16) {
-        buffer[offset + 0] = UInt8(value >> 8)
-        buffer[offset + 1] = UInt8(value & 0xff)
-    }
-    
-    /**
-     Write a 64-bit big endian value to a buffer.
-     */
-    private static func writeUint64(_ buffer: UnsafeMutablePointer<UInt8>, offset: Int, value: UInt64) {
-        for i in 0...7 {
-            buffer[offset + i] = UInt8((value >> (8*UInt64(7 - i))) & 0xff)
-        }
-    }
-
-    /**
-     Process one message at the start of `buffer`. Return another buffer (sharing storage) that contains the leftover contents of `buffer` that I didn't process.
-     */
-    private func processOneRawMessage(inBuffer buffer: UnsafeBufferPointer<UInt8>) -> UnsafeBufferPointer<UInt8> {
-        let response = readStack.last
-        guard let baseAddress = buffer.baseAddress else {return emptyBuffer}
-        let bufferLen = buffer.count
-        if response != nil && bufferLen < 2 {
-            fragBuffer = Data(buffer: buffer)
-            return emptyBuffer
-        }
-        if let response = response, response.bytesLeft > 0 {
-            var len = response.bytesLeft
-            var extra = bufferLen - response.bytesLeft
-            if response.bytesLeft > bufferLen {
-                len = bufferLen
-                extra = 0
-            }
-            response.bytesLeft -= len
-            response.buffer?.append(Data(bytes: baseAddress, count: len))
-            _ = processResponse(response)
-            return buffer.fromOffset(bufferLen - extra)
-        } else {
-            let isFin = (FinMask & baseAddress[0])
-            let receivedOpcode = OpCode(rawValue: (OpCodeMask & baseAddress[0]))
-            let isMasked = (MaskMask & baseAddress[1])
-            let payloadLen = (PayloadLenMask & baseAddress[1])
-            var offset = 2
-            if (isMasked > 0 || (RSVMask & baseAddress[0]) > 0) && receivedOpcode != .pong {
-                let errCode = CloseCode.protocolError.rawValue
-                doDisconnect(errorWithDetail("masked and rsv data is not currently supported", code: errCode))
-                writeError(errCode)
-                return emptyBuffer
-            }
-            let isControlFrame = (receivedOpcode == .connectionClose || receivedOpcode == .ping)
-            if !isControlFrame && (receivedOpcode != .binaryFrame && receivedOpcode != .continueFrame &&
-                receivedOpcode != .textFrame && receivedOpcode != .pong) {
-                    let errCode = CloseCode.protocolError.rawValue
-                    doDisconnect(errorWithDetail("unknown opcode: \(receivedOpcode)", code: errCode))
-                    writeError(errCode)
-                    return emptyBuffer
-            }
-            if isControlFrame && isFin == 0 {
-                let errCode = CloseCode.protocolError.rawValue
-                doDisconnect(errorWithDetail("control frames can't be fragmented", code: errCode))
-                writeError(errCode)
-                return emptyBuffer
-            }
-            if receivedOpcode == .connectionClose {
-                var code = CloseCode.normal.rawValue
-                if payloadLen == 1 {
-                    code = CloseCode.protocolError.rawValue
-                } else if payloadLen > 1 {
-                    code = WebSocket.readUint16(baseAddress, offset: offset)
-                    if code < 1000 || (code > 1003 && code < 1007) || (code > 1011 && code < 3000) {
-                        code = CloseCode.protocolError.rawValue
-                    }
-                    offset += 2
-                }
-                var closeReason = "connection closed by server"
-                if payloadLen > 2 {
-                    let len = Int(payloadLen - 2)
-                    if len > 0 {
-                        let bytes = baseAddress + offset
-                        if let customCloseReason = String(data: Data(bytes: bytes, count: len), encoding: .utf8) {
-                            closeReason = customCloseReason
-                        } else {
-                            code = CloseCode.protocolError.rawValue
-                        }
-                    }
-                }
-                doDisconnect(errorWithDetail(closeReason, code: code))
-                writeError(code)
-                return emptyBuffer
-            }
-            if isControlFrame && payloadLen > 125 {
-                writeError(CloseCode.protocolError.rawValue)
-                return emptyBuffer
-            }
-            var dataLength = UInt64(payloadLen)
-            if dataLength == 127 {
-                dataLength = WebSocket.readUint64(baseAddress, offset: offset)
-                offset += MemoryLayout<UInt64>.size
-            } else if dataLength == 126 {
-                dataLength = UInt64(WebSocket.readUint16(baseAddress, offset: offset))
-                offset += MemoryLayout<UInt16>.size
-            }
-            if bufferLen < offset || UInt64(bufferLen - offset) < dataLength {
-                fragBuffer = Data(bytes: baseAddress, count: bufferLen)
-                return emptyBuffer
-            }
-            var len = dataLength
-            if dataLength > UInt64(bufferLen) {
-                len = UInt64(bufferLen-offset)
-            }
-            let data: Data
-            if len < 0 {
-                len = 0
-                data = Data()
-            } else {
-                data = Data(bytes: baseAddress+offset, count: Int(len))
-            }
-            if receivedOpcode == .pong {
-                if canDispatch {
-                    callbackQueue.async { [weak self] in
-                        guard let s = self else { return }
-                        let pongData: Data? = data.count > 0 ? data : nil
-                        s.onPong?(pongData)
-                        s.pongDelegate?.websocketDidReceivePong(socket: s, data: pongData)
-                    }
-                }
-                return buffer.fromOffset(offset + Int(len))
-            }
-            var response = readStack.last
-            if isControlFrame {
-                response = nil // Don't append pings.
-            }
-            if isFin == 0 && receivedOpcode == .continueFrame && response == nil {
-                let errCode = CloseCode.protocolError.rawValue
-                doDisconnect(errorWithDetail("continue frame before a binary or text frame", code: errCode))
-                writeError(errCode)
-                return emptyBuffer
-            }
-            var isNew = false
-            if response == nil {
-                if receivedOpcode == .continueFrame {
-                    let errCode = CloseCode.protocolError.rawValue
-                    doDisconnect(errorWithDetail("first frame can't be a continue frame",
-                        code: errCode))
-                    writeError(errCode)
-                    return emptyBuffer
-                }
-                isNew = true
-                response = WSResponse()
-                response!.code = receivedOpcode!
-                response!.bytesLeft = Int(dataLength)
-                response!.buffer = NSMutableData(data: data)
-            } else {
-                if receivedOpcode == .continueFrame {
-                    response!.bytesLeft = Int(dataLength)
-                } else {
-                    let errCode = CloseCode.protocolError.rawValue
-                    doDisconnect(errorWithDetail("second and beyond of fragment message must be a continue frame",
-                        code: errCode))
-                    writeError(errCode)
-                    return emptyBuffer
-                }
-                response!.buffer!.append(data)
-            }
-            if let response = response {
-                response.bytesLeft -= Int(len)
-                response.frameCount += 1
-                response.isFin = isFin > 0 ? true : false
-                if isNew {
-                    readStack.append(response)
-                }
-                _ = processResponse(response)
-            }
-
-            let step = Int(offset + numericCast(len))
-            return buffer.fromOffset(step)
-        }
-    }
-
-    /**
-     Process all messages in the buffer if possible.     
-     */
-    private func processRawMessagesInBuffer(_ pointer: UnsafePointer<UInt8>, bufferLen: Int) {
-        var buffer = UnsafeBufferPointer(start: pointer, count: bufferLen)
-        repeat {
-            buffer = processOneRawMessage(inBuffer: buffer)
-        } while buffer.count >= 2
-        if buffer.count > 0 {
-            fragBuffer = Data(buffer: buffer)
-        }
-    }
-
-    /**
-     Process the finished response of a buffer.
-     */
-    private func processResponse(_ response: WSResponse) -> Bool {
-        if response.isFin && response.bytesLeft <= 0 {
-            if response.code == .ping {
-                let data = response.buffer! // local copy so it is perverse for writing
-                dequeueWrite(data as Data, code: .pong)
-            } else if response.code == .textFrame {
-                let str: NSString? = NSString(data: response.buffer! as Data, encoding: String.Encoding.utf8.rawValue)
-                if str == nil {
-                    writeError(CloseCode.encoding.rawValue)
-                    return false
-                }
-                if canDispatch {
-                    callbackQueue.async { [weak self] in
-                        guard let s = self else { return }
-                        s.onText?(str! as String)
-                        s.delegate?.websocketDidReceiveMessage(socket: s, text: str! as String)
-                    }
-                }
-            } else if response.code == .binaryFrame {
-                if canDispatch {
-                    let data = response.buffer! // local copy so it is perverse for writing
-                    callbackQueue.async { [weak self] in
-                        guard let s = self else { return }
-                        s.onData?(data as Data)
-                        s.delegate?.websocketDidReceiveData(socket: s, data: data as Data)
-                    }
-                }
-            }
-            readStack.removeLast()
-            return true
-        }
-        return false
-    }
-    
-    /**
-     Create an error
-     */
-    private func errorWithDetail(_ detail: String, code: UInt16) -> NSError {
-        var details = [String: String]()
-        details[NSLocalizedDescriptionKey] =  detail
-        return NSError(domain: WebSocket.ErrorDomain, code: Int(code), userInfo: details)
-    }
-    
-    /**
-     Write an error to the socket
-     */
-    private func writeError(_ code: UInt16) {
-        let buf = NSMutableData(capacity: MemoryLayout<UInt16>.size)
-        let buffer = UnsafeMutableRawPointer(mutating: buf!.bytes).assumingMemoryBound(to: UInt8.self)
-        WebSocket.writeUint16(buffer, offset: 0, value: code)
-        dequeueWrite(Data(bytes: buffer, count: MemoryLayout<UInt16>.size), code: .connectionClose)
-    }
-    
-    /**
-     Used to write things to the stream
-     */
-    private func dequeueWrite(_ data: Data, code: OpCode, writeCompletion: (() -> ())? = nil) {
-        writeQueue.addOperation { [weak self] in
-            //stream isn't ready, let's wait
-            guard let s = self else { return }
-            var offset = 2
-            let dataLength = data.count
-            let frame = NSMutableData(capacity: dataLength + s.MaxFrameSize)
-            let buffer = UnsafeMutableRawPointer(frame!.mutableBytes).assumingMemoryBound(to: UInt8.self)
-            buffer[0] = s.FinMask | code.rawValue
-            if dataLength < 126 {
-                buffer[1] = CUnsignedChar(dataLength)
-            } else if dataLength <= Int(UInt16.max) {
-                buffer[1] = 126
-                WebSocket.writeUint16(buffer, offset: offset, value: UInt16(dataLength))
-                offset += MemoryLayout<UInt16>.size
-            } else {
-                buffer[1] = 127
-                WebSocket.writeUint64(buffer, offset: offset, value: UInt64(dataLength))
-                offset += MemoryLayout<UInt64>.size
-            }
-            buffer[1] |= s.MaskMask
-            let maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
-            _ = SecRandomCopyBytes(kSecRandomDefault, Int(MemoryLayout<UInt32>.size), maskKey)
-            offset += MemoryLayout<UInt32>.size
-            
-            for i in 0..<dataLength {
-                buffer[offset] = data[i] ^ maskKey[i % MemoryLayout<UInt32>.size]
-                offset += 1
-            }
-            var total = 0
-            while true {
-                guard let outStream = s.outputStream else { break }
-                let writeBuffer = UnsafeRawPointer(frame!.bytes+total).assumingMemoryBound(to: UInt8.self)
-                let len = outStream.write(writeBuffer, maxLength: offset-total)
-                if len < 0 {
-                    var error: Error?
-                    if let streamError = outStream.streamError {
-                        error = streamError
-                    } else {
-                        let errCode = InternalErrorCode.outputStreamWriteError.rawValue
-                        error = s.errorWithDetail("output stream error during write", code: errCode)
-                    }
-                    s.doDisconnect(error as NSError?)
-                    break
-                } else {
-                    total += len
-                }
-                if total >= offset {
-                    if let queue = self?.callbackQueue, let callback = writeCompletion {
-                        queue.async {
-                            callback()
-                        }
-                    }
-
-                    break
-                }
-            }
-
-        }
-    }
-    
-    /**
-     Used to preform the disconnect delegate
-     */
-    private func doDisconnect(_ error: NSError?) {
-        guard !didDisconnect else { return }
-        didDisconnect = true
-        connected = false
-        guard canDispatch else {return}
-        callbackQueue.async { [weak self] in
-            guard let s = self else { return }
-            s.onDisconnect?(error)
-            s.delegate?.websocketDidDisconnect(socket: s, error: error)
-            let userInfo = error.map{ [WebsocketDisconnectionErrorKeyName: $0] }
-            s.notificationCenter.post(name: NSNotification.Name(WebsocketDidDisconnectNotification), object: self, userInfo: userInfo)
-        }
-    }
-
-    // MARK: - Deinit
-
-    deinit {
-        mutex.lock()
-        readyToWrite = false
-        mutex.unlock()
-        cleanupStream()
-    }
-
-}
-
-private extension Data {
-
-    init(buffer: UnsafeBufferPointer<UInt8>) {
-        self.init(bytes: buffer.baseAddress!, count: buffer.count)
-    }
-
-}
-
-private extension UnsafeBufferPointer {
-
-    func fromOffset(_ offset: Int) -> UnsafeBufferPointer<Element> {
-        return UnsafeBufferPointer<Element>(start: baseAddress?.advanced(by: offset), count: count - offset)
-    }
-    
-}
-
-private let emptyBuffer = UnsafeBufferPointer<UInt8>(start: nil, count: 0)
@@ -0,0 +1,177 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Compression.swift
+//
+//  Created by Joseph Ross on 7/16/14.
+//  Copyright © 2017 Joseph Ross.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Compression implementation is implemented in conformance with RFC 7692 Compression Extensions
+//  for WebSocket: https://tools.ietf.org/html/rfc7692
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+import Foundation
+import SSCZLib
+
+class Decompressor {
+    private var strm = z_stream()
+    private var buffer = [UInt8](repeating: 0, count: 0x2000)
+    private var inflateInitialized = false
+    private let windowBits:Int
+
+    init?(windowBits:Int) {
+        self.windowBits = windowBits
+        guard initInflate() else { return nil }
+    }
+
+    private func initInflate() -> Bool {
+        if Z_OK == inflateInit2_(&strm, -CInt(windowBits),
+                                 ZLIB_VERSION, CInt(MemoryLayout<z_stream>.size))
+        {
+            inflateInitialized = true
+            return true
+        }
+        return false
+    }
+
+    func reset() throws {
+        teardownInflate()
+        guard initInflate() else { throw WSError(type: .compressionError, message: "Error for decompressor on reset", code: 0) }
+    }
+
+    func decompress(_ data: Data, finish: Bool) throws -> Data {
+        return try data.withUnsafeBytes { (bytes:UnsafePointer<UInt8>) -> Data in
+            return try decompress(bytes: bytes, count: data.count, finish: finish)
+        }
+    }
+
+    func decompress(bytes: UnsafePointer<UInt8>, count: Int, finish: Bool) throws -> Data {
+        var decompressed = Data()
+        try decompress(bytes: bytes, count: count, out: &decompressed)
+
+        if finish {
+            let tail:[UInt8] = [0x00, 0x00, 0xFF, 0xFF]
+            try decompress(bytes: tail, count: tail.count, out: &decompressed)
+        }
+
+        return decompressed
+
+    }
+
+    private func decompress(bytes: UnsafePointer<UInt8>, count: Int, out:inout Data) throws {
+        var res:CInt = 0
+        strm.next_in = UnsafeMutablePointer<UInt8>(mutating: bytes)
+        strm.avail_in = CUnsignedInt(count)
+
+        repeat {
+            strm.next_out = UnsafeMutablePointer<UInt8>(&buffer)
+            strm.avail_out = CUnsignedInt(buffer.count)
+
+            res = inflate(&strm, 0)
+
+            let byteCount = buffer.count - Int(strm.avail_out)
+            out.append(buffer, count: byteCount)
+        } while res == Z_OK && strm.avail_out == 0
+
+        guard (res == Z_OK && strm.avail_out > 0)
+            || (res == Z_BUF_ERROR && Int(strm.avail_out) == buffer.count)
+            else {
+                throw WSError(type: .compressionError, message: "Error on decompressing", code: 0)
+        }
+    }
+
+    private func teardownInflate() {
+        if inflateInitialized, Z_OK == inflateEnd(&strm) {
+            inflateInitialized = false
+        }
+    }
+
+    deinit {
+        teardownInflate()
+    }
+}
+
+class Compressor {
+    private var strm = z_stream()
+    private var buffer = [UInt8](repeating: 0, count: 0x2000)
+    private var deflateInitialized = false
+    private let windowBits:Int
+
+    init?(windowBits: Int) {
+        self.windowBits = windowBits
+        guard initDeflate() else { return nil }
+    }
+
+    private func initDeflate() -> Bool {
+        if Z_OK == deflateInit2_(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
+                                 -CInt(windowBits), 8, Z_DEFAULT_STRATEGY,
+                                 ZLIB_VERSION, CInt(MemoryLayout<z_stream>.size))
+        {
+            deflateInitialized = true
+            return true
+        }
+        return false
+    }
+
+    func reset() throws {
+        teardownDeflate()
+        guard initDeflate() else { throw WSError(type: .compressionError, message: "Error for compressor on reset", code: 0) }
+    }
+
+    func compress(_ data: Data) throws -> Data {
+        var compressed = Data()
+        var res:CInt = 0
+        data.withUnsafeBytes { (ptr:UnsafePointer<UInt8>) -> Void in
+            strm.next_in = UnsafeMutablePointer<UInt8>(mutating: ptr)
+            strm.avail_in = CUnsignedInt(data.count)
+
+            repeat {
+                strm.next_out = UnsafeMutablePointer<UInt8>(&buffer)
+                strm.avail_out = CUnsignedInt(buffer.count)
+
+                res = deflate(&strm, Z_SYNC_FLUSH)
+
+                let byteCount = buffer.count - Int(strm.avail_out)
+                compressed.append(buffer, count: byteCount)
+            }
+            while res == Z_OK && strm.avail_out == 0
+
+        }
+
+        guard res == Z_OK && strm.avail_out > 0
+            || (res == Z_BUF_ERROR && Int(strm.avail_out) == buffer.count)
+        else {
+            throw WSError(type: .compressionError, message: "Error on compressing", code: 0)
+        }
+
+        compressed.removeLast(4)
+        return compressed
+    }
+
+    private func teardownDeflate() {
+        if deflateInitialized, Z_OK == deflateEnd(&strm) {
+            deflateInitialized = false
+        }
+    }
+
+    deinit {
+        teardownDeflate()
+    }
+}
+
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>3.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -19,11 +19,16 @@
 //  limitations under the License.
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////
-
+#if os(Linux)
+#else
 import Foundation
 import Security

-public class SSLCert {
+public protocol SSLTrustValidator {
+    func isValid(_ trust: SecTrust, domain: String?) -> Bool
+}
+
+open class SSLCert {
    var certData: Data?
    var key: SecKey?
    
@@ -50,9 +55,10 @@ public class SSLCert {
    }
 }

-public class SSLSecurity {
+open class SSLSecurity : SSLTrustValidator {
    public var validatedDN = true //should the domain name be validated?
-    
+    public var validateEntireChain = true //should the entire cert chain be validated
+
    var isReady = false //is the key processing done?
    var certificates: [Data]? //the certificates
    var pubKeys: [SecKey]? //the public keys
@@ -82,7 +88,7 @@ public class SSLSecurity {
    /**
    Designated init
    
-    - parameter keys: is the certificates or public keys to use
+    - parameter certs: 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
@@ -165,6 +171,9 @@ public class SSLSecurity {
            var result: SecTrustResultType = .unspecified
            SecTrustEvaluate(trust,&result)
            if result == .unspecified || result == .proceed {
+                if !validateEntireChain {
+                    return true
+                }
                var trustedCount = 0
                for serverCert in serverCerts {
                    for cert in certs {
@@ -254,3 +263,4 @@ public class SSLSecurity {
    
    
 }
+#endif
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
  s.name         = "Starscream"
-  s.version      = "2.0.0"
-  s.summary      = "A conforming WebSocket RFC 6455 client library in Swift for iOS and OSX."
+  s.version      = "3.0.5"
+  s.summary      = "A conforming WebSocket RFC 6455 client library in Swift."
  s.homepage     = "https://github.com/daltoniam/Starscream"
  s.license      = 'Apache License, Version 2.0'
  s.author       = {'Dalton Cherry' => 'http://daltoniam.com', 'Austin Cherry' => 'http://austincherry.me'}
@@ -10,6 +10,12 @@ Pod::Spec.new do |s|
  s.ios.deployment_target = '8.0'
  s.osx.deployment_target = '10.10'
  s.tvos.deployment_target = '9.0'
-  s.source_files = 'Source/*.swift'
-  s.requires_arc = 'true'
+  s.watchos.deployment_target = '2.0'
+  s.source_files = 'Sources/*.swift'
+  s.libraries    = 'z'
+  s.pod_target_xcconfig = {
+  'SWIFT_VERSION' => '4.1',
+  'SWIFT_INCLUDE_PATHS' => '$(PODS_ROOT)/Starscream/zlib'
+  }
+  s.preserve_paths = 'zlib/*'
 end
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
-   version = "1.3">
+   LastUpgradeVersion = "0900"
+   version = "1.7">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
@@ -14,9 +14,9 @@
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
+               BlueprintIdentifier = "33CCF0841F5DDC030099B092"
               BuildableName = "Starscream.framework"
-               BlueprintName = "Starscream iOS"
+               BlueprintName = "Starscream"
               ReferencedContainer = "container:Starscream.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -26,9 +26,34 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "335FA1F41F5DF71D00F6D2EC"
+               BuildableName = "Starscream Tests.xctest"
+               BlueprintName = "Starscream Tests"
+               ReferencedContainer = "container:Starscream.xcodeproj">
+            </BuildableReference>
+            <LocationScenarioReference
+               identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+               referenceType = "1">
+            </LocationScenarioReference>
+         </TestableReference>
      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CCF0841F5DDC030099B092"
+            BuildableName = "Starscream.framework"
+            BlueprintName = "Starscream"
+            ReferencedContainer = "container:Starscream.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
      <AdditionalOptions>
      </AdditionalOptions>
   </TestAction>
@@ -36,6 +61,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -45,9 +71,9 @@
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
+            BlueprintIdentifier = "33CCF0841F5DDC030099B092"
            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream iOS"
+            BlueprintName = "Starscream"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -63,9 +89,9 @@
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
+            BlueprintIdentifier = "33CCF0841F5DDC030099B092"
            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream iOS"
+            BlueprintName = "Starscream"
            ReferencedContainer = "container:Starscream.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0800"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-               BuildableName = "Starscream.framework"
-               BlueprintName = "Starscream OSX"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D9C3E36819E48FF1009FC285"
-               BuildableName = "Starscream OSXTests.xctest"
-               BlueprintName = "Starscream OSXTests"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D9C3E36819E48FF1009FC285"
-               BuildableName = "Starscream OSXTests.xctest"
-               BlueprintName = "Starscream OSXTests"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream OSX"
-            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"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream OSX"
-            ReferencedContainer = "container:Starscream.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
-            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream OSX"
-            ReferencedContainer = "container:Starscream.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0800"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-               BuildableName = "Starscream iOSTests.xctest"
-               BlueprintName = "Starscream iOSTests"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-               BuildableName = "Starscream iOSTests.xctest"
-               BlueprintName = "Starscream iOSTests"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-            BuildableName = "Starscream iOSTests.xctest"
-            BlueprintName = "Starscream iOSTests"
-            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"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-            BuildableName = "Starscream iOSTests.xctest"
-            BlueprintName = "Starscream iOSTests"
-            ReferencedContainer = "container:Starscream.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
-            BuildableName = "Starscream iOSTests.xctest"
-            BlueprintName = "Starscream iOSTests"
-            ReferencedContainer = "container:Starscream.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0800"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "091277961BD673A70003036D"
-               BuildableName = "Starscream.framework"
-               BlueprintName = "Starscream tvOS"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0912779F1BD673A70003036D"
-               BuildableName = "Starscream tvOSTests.xctest"
-               BlueprintName = "Starscream tvOSTests"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0912779F1BD673A70003036D"
-               BuildableName = "Starscream tvOSTests.xctest"
-               BlueprintName = "Starscream tvOSTests"
-               ReferencedContainer = "container:Starscream.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "091277961BD673A70003036D"
-            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream tvOS"
-            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"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "091277961BD673A70003036D"
-            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream tvOS"
-            ReferencedContainer = "container:Starscream.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "091277961BD673A70003036D"
-            BuildableName = "Starscream.framework"
-            BlueprintName = "Starscream tvOS"
-            ReferencedContainer = "container:Starscream.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -0,0 +1,65 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  CompressionTests.swift
+//
+//  Created by Joseph Ross on 7/16/14.
+//  Copyright © 2017 Joseph Ross.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+import XCTest
+
+class CompressionTests: 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 testBasic() {
+        let compressor = Compressor(windowBits: 15)!
+        let decompressor = Decompressor(windowBits: 15)!
+        
+        let rawData = "Hello, World! Hello, World! Hello, World! Hello, World! Hello, World!".data(using: .utf8)!
+        
+        let compressed = try! compressor.compress(rawData)
+        let uncompressed = try! decompressor.decompress(compressed, finish: true)
+        
+        XCTAssert(rawData == uncompressed)
+    }
+    
+    func testHugeData() {
+        let compressor = Compressor(windowBits: 15)!
+        let decompressor = Decompressor(windowBits: 15)!
+        
+        // 2 Gigs!
+//        var rawData = Data(repeating: 0, count: 0x80000000)
+        var rawData = Data(repeating: 0, count: 0x80000)
+        rawData.withUnsafeMutableBytes { (ptr: UnsafeMutablePointer<UInt8>) -> Void in
+            arc4random_buf(ptr, rawData.count)
+        }
+        
+        let compressed = try! compressor.compress(rawData)
+        let uncompressed = try! decompressor.decompress(compressed, finish: true)
+        
+        XCTAssert(rawData == uncompressed)
+    }
+    
+}
@@ -20,7 +20,7 @@ class ViewController: UIViewController {
        //getTestInfo(1)
    }
    
-    func removeSocket(_ s: WebSocket) {
+    func removeSocket(_ s: WebSocket?) {
        socketArray = socketArray.filter{$0 != s}
    }
    
@@ -28,15 +28,15 @@ class ViewController: UIViewController {
        
        let s = WebSocket(url: URL(string: "ws://\(host)/getCaseCount")!, protocols: [])
        socketArray.append(s)
-        s.onText = {[unowned self] (text: String) in
+        s.onText = { [weak self]  (text: String) in
            if let c = Int(text) {
                print("number of cases is: \(c)")
-                self.caseCount = c
+                self?.caseCount = c
            }
        }
-        s.onDisconnect = {[unowned self] (error: NSError?) in
-            self.getTestInfo(1)
-            self.removeSocket(s)
+        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
+            self?.getTestInfo(1)
+            self?.removeSocket(s)
        }
        s.connect()
    }
@@ -44,7 +44,7 @@ class ViewController: UIViewController {
    func getTestInfo(_ caseNum: Int) {
        let s = createSocket("getCaseInfo",caseNum)
        socketArray.append(s)
-        s.onText = {(text: String) in
+        s.onText = { (text: String) in
 //            let data = text.dataUsingEncoding(NSUTF8StringEncoding)
 //            do {
 //                let resp: AnyObject? = try NSJSONSerialization.JSONObjectWithData(data!,
@@ -62,12 +62,12 @@ class ViewController: UIViewController {

        }
        var once = false
-        s.onDisconnect = {[unowned self] (error: NSError?) in
+        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
            if !once {
                once = true
-                self.runTest(caseNum)
+                self?.runTest(caseNum)
            }
-            self.removeSocket(s)
+            self?.removeSocket(s)
        }
        s.connect()
    }
@@ -75,19 +75,26 @@ class ViewController: UIViewController {
    func runTest(_ caseNum: Int) {
        let s = createSocket("runCase",caseNum)
        self.socketArray.append(s)
-        s.onText = {(text: String) in
-            s.write(string: text)
+        s.onText = { [weak s]  (text: String) in
+            s?.write(string: text)
        }
-        s.onData = {(data: Data) in
-            s.write(data: data)
+        s.onData = { [weak s]  (data: Data) in
+            s?.write(data: data)
        }
        var once = false
-        s.onDisconnect = {[unowned self] (error: NSError?) in
+        s.onDisconnect = {[weak self, weak s] (error: Error?) in
            if !once {
                once = true
                print("case:\(caseNum) finished")
-                self.verifyTest(caseNum)
-                self.removeSocket(s)
+                //self?.verifyTest(caseNum) //disabled since it slows down the tests
+                let nextCase = caseNum+1
+                if nextCase <= (self?.caseCount)! {
+                    self?.runTest(nextCase)
+                    //self?.getTestInfo(nextCase) //disabled since it slows down the tests
+                } else {
+                    self?.finishReports()
+                }
+                self?.removeSocket(s)
            }
        }
        s.connect()
@@ -96,7 +103,7 @@ class ViewController: UIViewController {
    func verifyTest(_ caseNum: Int) {
        let s = createSocket("getCaseStatus",caseNum)
        self.socketArray.append(s)
-        s.onText = {(text: String) in
+        s.onText = { (text: String) in
            let data = text.data(using: String.Encoding.utf8)
            do {
                let resp: Any? = try JSONSerialization.jsonObject(with: data!,
@@ -115,17 +122,18 @@ class ViewController: UIViewController {
            }
        }
        var once = false
-        s.onDisconnect = {[unowned self] (error: NSError?) in
+        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
            if !once {
                once = true
                let nextCase = caseNum+1
-                if nextCase <= self.caseCount {
-                    self.getTestInfo(nextCase)
+                print("next test is: \(nextCase)")
+                if nextCase <= (self?.caseCount)! {
+                    self?.getTestInfo(nextCase)
                } else {
-                    self.finishReports()
+                    self?.finishReports()
                }
            }
-            self.removeSocket(s)
+            self?.removeSocket(s)
        }
        s.connect()
    }
@@ -133,9 +141,9 @@ class ViewController: UIViewController {
    func finishReports() {
        let s = createSocket("updateReports",0)
        self.socketArray.append(s)
-        s.onDisconnect = {[unowned self] (error: NSError?) in
+        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
            print("finished all the tests!")
-            self.removeSocket(s)
+            self?.removeSocket(s)
        }
        s.connect()
    }
@@ -145,7 +145,7 @@
 				6B3E7A0E19D48D00006071F7 /* Starscream.framework */,
 				6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */,
 				5C06AE8B1B08044600D41060 /* Starscream.framework */,
-				5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */,
+				5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */,
 				5C42C3E11D8F31DC00947AA2 /* Starscream.framework */,
 				5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */,
 			);
@@ -181,7 +181,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = vluxe;
 				TargetAttributes = {
 					5C765ADA199A6DAA003D9110 = {
@@ -311,14 +311,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = 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_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -358,14 +364,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = 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_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -399,7 +411,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -412,7 +424,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@@ -69,6 +70,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -85,6 +87,13 @@
            ReferencedContainer = "container:SimpleTest.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>
@@ -10,33 +10,38 @@ import UIKit
 import Starscream

 class ViewController: UIViewController, WebSocketDelegate {
-    var socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat", "superchat"])
+    var socket: WebSocket!
    
    override func viewDidLoad() {
        super.viewDidLoad()
+        var request = URLRequest(url: URL(string: "http://localhost:8080")!)
+        request.timeoutInterval = 5
+        socket = WebSocket(request: request)
        socket.delegate = self
        socket.connect()
    }
    
    // MARK: Websocket Delegate Methods.
    
-    func websocketDidConnect(socket: WebSocket) {
+    func websocketDidConnect(socket: WebSocketClient) {
        print("websocket is connected")
    }
    
-    func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
-        if let e = error {
+    func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
+        if let e = error as? WSError {
+            print("websocket is disconnected: \(e.message)")
+        } else if let e = error {
            print("websocket is disconnected: \(e.localizedDescription)")
        } else {
             print("websocket disconnected")
        }
    }
    
-    func websocketDidReceiveMessage(socket: WebSocket, text: String) {
+    func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
        print("Received text: \(text)")
    }
    
-    func websocketDidReceiveData(socket: WebSocket, data: Data) {
+    func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
        print("Received data: \(data.count)")
    }
    
@@ -22,4 +22,4 @@ EM.run {
      ws.send Faker::Hacker.say_something_smart
    }
  end
-}
+}
@@ -0,0 +1,2 @@
+#include <zlib.h>
+#include <CommonCrypto/CommonCrypto.h>
@@ -0,0 +1,9 @@
+module SSCZLib [system] {
+    header "include.h"
+    link "z"
+    export *
+}
+module SSCommonCrypto [system] {
+    header "include.h"
+    export *
+}
Author	SHA1	Message	Date
daltoniam	114e5df9b6	Merge branch 'master' of https://github.com/daltoniam/Starscream	2018-04-04 13:16:29 -05:00
daltoniam	430bfc32c3	a few small bug fixes and swift 4.1 support	2018-04-04 13:16:20 -05:00
Austin Cherry	31f522155a	Merge pull request #461 from rastersize/remove-cartfile Remove Cartfile as the checkout is unused	2018-02-19 17:22:33 -06:00
Aron Cedercrantz	327a7d8e9e	Remove Cartfile as the checkout is unused	2018-01-30 18:04:11 -05:00
daltoniam	6e10c04c83	bumped spec. Updated CHANGELOG	2018-01-13 19:14:22 -06:00
daltoniam	97401e04bc	Merge branch 'master' of https://github.com/daltoniam/Starscream	2018-01-13 18:56:36 -06:00
Dalton	6ba3563148	Merge pull request #452 from victorg1991/master Enable editing Host header value	2018-01-13 18:56:27 -06:00
daltoniam	146368c71a	new error handling. Timeout fix. Assorted fixes	2018-01-13 18:53:59 -06:00
Victor Galan	4ea6f4be3a	Enable editing Host header value	2018-01-11 17:20:04 +01:00
daltoniam	6cb1c474e0	watchos, forgot about that one	2017-12-08 13:56:15 -06:00
daltoniam	7102d31afb	watchos, forgot about that one	2017-12-08 13:53:31 -06:00
daltoniam	0f94bb3d95	spec	2017-12-08 13:46:43 -06:00
daltoniam	28070bf2a4	bumped spec	2017-12-08 13:40:21 -06:00
daltoniam	ee0c7f9213	Merge branch 'master' of https://github.com/daltoniam/Starscream	2017-12-08 13:06:52 -06:00
daltoniam	a49c7e2119	bug fixes	2017-12-08 13:06:50 -06:00
Dalton	7fad6b3a82	Merge pull request #438 from BlakeBarrett/patch-1 Update README.md	2017-12-08 13:04:32 -06:00
Dalton	06baac0fe7	Merge pull request #423 from neoneye/master enableSOCKSProxy - See websocket traffic in Charles proxy	2017-12-08 13:04:16 -06:00
Blake Barrett	5866676617	Update README.md Fix a typo in one of the code samples.	2017-12-07 16:44:04 -08:00
Simon Strandgaard	b074c6c833	I was unable to see any websocket traffic in Charles proxy. In order to enable websocket inspection I applied the snippet by https://github.com/kevinmlong that is mentioned here: https://github.com/daltoniam/Starscream/issues/240	2017-11-15 15:58:36 +01:00
Dalton	8f2af31bd3	Merge pull request #418 from frederik-jacques/master Fix warning for Swift 4 on the use of `character` property	2017-11-08 12:51:17 -06:00
Dalton	d3fb769f93	Merge pull request #420 from fjcaetano/fix/deployment_target Fix: tvOS framework deployment target	2017-11-08 12:47:36 -06:00
Flávio Caetano	f58eb4ccad	Fix: tvOS framework deployment target fix #419	2017-11-07 17:35:35 -02:00
Frederik Jacques	880b5b4c9e	Fix warning for Swift 4 on the use of `character` property	2017-11-07 09:37:00 +01:00
Dalton	97e378d94a	Merge pull request #405 from hishnash/sendPong Expose Pong Control frames	2017-11-06 12:58:32 -06:00
Dalton	ca20b02ca2	Merge pull request #410 from qiuncheng/master Fixed #409 When url contains query, server cannot get query parameters.	2017-11-06 12:57:18 -06:00
Dalton	a1f133d737	Merge pull request #412 from eliburke/master improved handling for self-signed certificate validation	2017-11-06 12:56:56 -06:00
Eli Burke	13f685f464	add flag to SSLSecurity implementation to turn off full cert chain checks. The existing code would not work in cases where a CA cert was trusted, and the web site used a signed leaf certificate. default behavior is unchanged	2017-10-31 11:41:41 -04:00
Eli Burke	fae7ef2817	preserve original behavior when desiredTrustHostname is set to nil or ""	2017-10-23 09:45:19 -04:00
Eli Burke	b24eaba135	separate self-signed from cert name override add a 2nd method of getting the remote host domain name	2017-10-20 16:29:25 -04:00
qiuncheng	e8182190b7	Fixed #409 When url contains query, server cannot get query parameters.	2017-10-17 14:22:22 +08:00
Dalton	bf24825167	Merge pull request #400 from fassko/ISSUE_399 Fixes #399 String.characters.count deprecation warning in Xcode 9.1	2017-10-16 12:50:57 -05:00
Dalton	9ee57e089d	Merge pull request #404 from rastersize/patch-1 Fix version number in changelog	2017-10-16 12:49:39 -05:00
Matthaus Woolard	f057a8b33d	Expose Pong Control frames * Let users send Pong frames * let users turn off automatic Ping responds with Pong. (only needed are edge cases)	2017-10-16 08:43:15 +03:00
Aron Cedercrantz	b8fe0f64e3	Fix version number in changelog	2017-10-13 15:02:06 -04:00
Kristaps Grinbergs	94e54af61c	Fixes #399 String.characters.count deprecation warnings	2017-10-09 16:40:15 +03:00
daltoniam	44ce58956f	handle trailing slash better. bumped version	2017-10-04 21:54:22 -05:00
daltoniam	c7cc1db0e3	fix for servers disliking not having a trailing slash. #394 , #392	2017-10-02 13:08:10 -05:00
daltoniam	a438ea1977	added armv7k	2017-09-27 15:12:41 -05:00
daltoniam	b5991eda48	version update	2017-09-27 13:42:09 -05:00
Dalton	0a6f6d2a79	Merge pull request #388 from nuclearace/fix-http-headers HTTP headers are case insensitive	2017-09-27 13:37:51 -05:00
Dalton	3fdf33a078	Merge pull request #390 from xjbeta/Fix-Deployment Add macOS Deployment Target.	2017-09-27 13:36:04 -05:00
xjbeta	9f5f0f44f9	Add macOS Deployment Target.	2017-09-27 14:12:42 +08:00
Erik Little	da7949d2da	HTTP headers are case insensitive	2017-09-26 13:12:43 -04:00
Dalton	dc48916804	Merge pull request #386 from lukkas/missing-arm64 add missing arm64	2017-09-26 11:51:03 -05:00
Lukasz Kasperek	e0e8271725	add missing armv7	2017-09-26 15:57:04 +02:00
Lukasz Kasperek	411820d836	add missing arm64	2017-09-26 14:56:33 +02:00
daltoniam	d326d448b0	pod spec update for new folder name	2017-09-25 16:29:15 -05:00
daltoniam	7dd90900dc	merged the swift 4 branch	2017-09-25 16:22:33 -05:00
daltoniam	f506be54ae	refactor and swift4	2017-09-25 16:00:28 -05:00
Dalton	143ab16c1a	Merge pull request #377 from hamchapman/two-targets-one-scheme Reduce to two targets and a single scheme	2017-09-22 13:17:03 -05:00
Hamilton Chapman	4d281416c2	Reduce to two targets and a single scheme	2017-09-05 10:30:55 +01:00
Dalton	e9d10000ec	Merge pull request #372 from jcesarmobile/patch-1 Use Swift 4	2017-09-02 14:33:58 -05:00
Austin Cherry	789264eeff	Merge pull request #375 from nremond/patch-1 Typo in README.md	2017-08-31 11:29:00 -05:00
Nicolas Rémond	644e8f92c0	Typo in README.md	2017-08-31 10:49:34 +02:00
jcesarmobile	68b64ede4e	Use Swift 4 update .swift-version file to use Swift 4	2017-08-23 11:06:25 +02:00
daltoniam	31277a418c	swift4 project file update	2017-08-19 17:23:58 -05:00
daltoniam	21678c9426	syntax fail	2017-08-19 17:03:45 -05:00
daltoniam	acbf665b3d	syntax fail	2017-08-19 17:01:00 -05:00
daltoniam	e99deb9af8	changelog	2017-08-19 16:59:41 -05:00
daltoniam	6dc9cdffbc	bumped spec	2017-08-19 16:50:40 -05:00
daltoniam	ef4ed1b2f9	Merge branch 'master' of https://github.com/daltoniam/Starscream	2017-08-14 21:53:03 -05:00
daltoniam	3401fb25f4	fix for possible race condition	2017-08-14 21:53:00 -05:00
Dalton	daa97005e6	Merge pull request #364 from nuclearace/master Namespace zlib and common crypto	2017-08-14 21:52:14 -05:00
Erik Little	008302326b	Namespace zlib and common crypto	2017-07-28 17:00:49 -04:00
Dalton	d7c41e513f	Merge pull request #357 from slk333/patch-2 typo	2017-07-28 14:15:47 -05:00
Dalton	92816513c3	Merge pull request #355 from danielrhammond/fix-segfault Fix race on connected	2017-07-28 14:15:31 -05:00
slk333	6c9f76e7ea	typo	2017-07-13 01:56:33 +02:00
Daniel Hammond	4d6dce3d64	Fix race on connected doDisconnect(_:) gets called from a background thread as part of the operation queued in dequeueWrite(_,code:completion:) when a connection failure triggers this code it produces a race between all the reads of isConnected and that write on a different queue.	2017-07-10 13:23:06 -07:00
Dalton	b0ed1decce	Merge pull request #331 from winsmith/master Added docs and error message for SSL Cipher Suites	2017-07-07 15:29:11 -05:00
daltoniam	86310e7bbc	updated podspec	2017-07-07 15:18:08 -05:00
daltoniam	7edfb2ad85	the joys of getting all the package manager to play nice	2017-07-07 14:38:47 -05:00
Daniel Jilg	1efe3ce798	Merge branch 'master' into master	2017-07-05 09:44:12 +02:00
Daniel Jilg	624a5cc6c3	Removed Else Clause that would sometimes give a wrong error message This reverts parts of commit `87dbce07ea`.	2017-07-05 09:42:27 +02:00
daltoniam	09b9136ef0	updated changelog	2017-06-29 17:48:36 -05:00
daltoniam	5434be279c	updated pod spec for compression changes	2017-06-29 17:46:31 -05:00
Dalton	08edd54a40	Merge pull request #349 from giullo/Fix-SSL-Pinning-Crash SecTrust object now is conditionally unwrapped	2017-06-29 17:44:18 -05:00
Giuliano Galea	8623fe8b9e	SecTrust object now is conditionally unwrapped	2017-06-27 10:29:29 +02:00
daltoniam	fa85b9c61c	spm fix	2017-06-24 19:09:03 -05:00
daltoniam	6e9a33a854	spm fix	2017-06-24 18:55:53 -05:00
daltoniam	b5e68fceae	package manager update	2017-06-24 18:13:24 -05:00
daltoniam	601ef74ca4	fixes #309 , #319 , #334	2017-06-24 18:09:48 -05:00
Dalton	7e517c246b	Merge pull request #337 from hishnash/AdvancedDelegate Add Advanced Delegate and Custom HTTP methods	2017-06-24 14:54:36 -05:00
Dalton	bb11123729	Merge pull request #344 from wittedhaddock/patch-1 Update README with (trite) grammar changes	2017-06-24 14:46:35 -05:00
Dalton	7bf478ce94	Merge pull request #339 from junelife/compression Support websocket compression	2017-06-24 14:45:25 -05:00
Matthaus Woolard	bce64dabfa	make WSResponse values public	2017-06-18 14:02:12 +03:00
Matthaus Woolard	3104c289e9	Add Advanced Delegate and Custom HTTP methods Added the `WebSocketAdvancedDelegate` protocol that optionaly replaces the `WebSocketDelegate` adding support for: * More detail when getting data (exposes the WSFrame object to the delegate) * More detail about the HTTP request and response so that the user can extract needed information. Also added support for custom HTTP methods for the http request.	2017-06-18 12:08:07 +03:00
James Graham	f35266534a	Update README with (trite) grammar changes	2017-06-06 10:46:07 -04:00
Joseph Ross	44fdfa3791	Include zlib as a module, rather than using `@_silgen_name` and redefinition. This is less verbose and less error-prone.	2017-05-25 14:23:07 -07:00
Joseph Ross	35fc161193	Add information about compression support to README. Other changes based on PR feedback.	2017-05-25 10:24:51 -07:00
Joseph Ross	45546818fb	Avoid unnecessary copying. Confirm Autobahn fuzzing test results are comparable with the autobahn library itself.	2017-05-24 17:17:12 -07:00
Joseph Ross	19793796bb	Fix capture memory leaks in Autobahn tester.	2017-05-24 13:39:06 -07:00
Joseph Ross	4ba077ee4b	Fixes to handle different windowsBits and noContextTakeover.	2017-05-24 13:06:37 -07:00
Joseph Ross	ca85642c21	Integrate compression classes.	2017-05-24 12:01:43 -07:00
Joseph Ross	ccc9c4ea43	Add compression classes and unit tests.	2017-05-24 07:38:03 -07:00
Dalton	02718e7a45	Merge pull request #333 from nuclearace/master Remove void parameter from onConnect, Swift4 would require passi…	2017-05-23 13:39:55 -05:00
Erik	961fd34f3d	Remove void parameter from onConnect, Swift4 would require passing () into it	2017-05-20 21:40:38 -04:00
Daniel Jilg	87dbce07ea	Add docs for SSL Cipher Suites	2017-05-04 15:44:26 +02:00
Dalton	ee993322c1	Merge pull request #320 from RaghavMangrola/master Swift Package Manager Installation Instructions	2017-03-28 20:15:52 -05:00
daltoniam	85070aab91	few warning fixes	2017-03-28 20:09:07 -05:00
Raghav Mangrola	07351dcb77	Swift Package Manager Installation Instructions	2017-03-19 16:11:13 -07:00
daltoniam	dbeb1190b8	some cleanup and SSL pinning fix	2017-03-14 13:12:39 -05:00
daltoniam	13859364e3	updated changelog	2017-02-03 14:25:31 -06:00
daltoniam	41c0c5e08b	version bump	2017-02-03 14:20:21 -06:00
daltoniam	60b27a4388	possible fix for #301	2017-01-11 22:55:39 -06:00
daltoniam	a68bf7c35b	connect delegate before firing message delegates. Fixed disconnect getting called before connect	2017-01-11 12:10:33 -06:00
Dalton	33a4551f3b	Merge pull request #302 from Elethier/operation-cancellation Fixed issues with not cancelling block operations properly	2017-01-10 22:25:12 -06:00
Dalton	b22fae407e	Merge pull request #300 from Elethier/multiple-disconnects Added guard against multiple disconnects	2017-01-10 21:41:02 -06:00
Dalton	e9160df255	Merge pull request #296 from nuclearace/fix-disconnect Fix #295	2017-01-06 21:32:13 -06:00
Praneet Sahgal	c63e173021	Fixed issues with not cancelling block operations properly	2017-01-04 09:15:56 -06:00
Praneet Sahgal	ddcc30d200	Added guard against multiple disconnects	2017-01-04 09:03:42 -06:00
Erik	6bacb6f972	Fix #295 This sets didDisconnect to false if we receive a connect.	2016-12-31 18:05:11 -05:00
Dalton	aca2ad5332	Merge pull request #292 from euskadi31/master Change public to open	2016-12-30 16:32:51 -06:00
Dalton	3ba1963c65	Merge pull request #294 from wordpress-mobile/prevent-reconnection-crash Prevent reconnection crash	2016-12-30 15:56:12 -06:00
Dalton	3cc4a60e05	Merge pull request #289 from robinmj/master Fix for excessive memory use caused by the receipt of an unusually large message	2016-12-30 15:54:37 -06:00
Jorge Bernal	14313df360	Disconnect and clean up streams before connecting. Since `disconnect` without a timeout only sends a close message to the server, if we tried to `connect` the socket again before the connection was closed it would not clean up the streams properly, which could result in a crash. See #272	2016-12-27 16:23:39 +01:00
Jorge Bernal	162c1d53b8	Keep isConnecting true while connecting. The existing code only prevented a second connection to be created while createHTTPRequest was being called (setting up the HTTP request and the streams). However, between the time when the socket opens the streams until the TCP handshake ends, it would be both `!conneted` and `!isConnecting`, which wouldn't prevent a second `connect`.	2016-12-27 15:56:01 +01:00
Axel Etcheverry	b404f98244	Change public to open	2016-12-19 15:31:10 +01:00
daltoniam	8d0c0c1afa	simple test update	2016-12-12 13:26:41 -06:00
Dalton	816fe413a4	Merge pull request #288 from dancasimiro/host-only-origin Remove the path components from the URL sent as origin	2016-12-12 13:22:27 -06:00
Daniel C. Casimiro	5cc0d860ba	Add path components to the test server URL This demonstrates the path stripping from the origin URL.	2016-11-22 08:53:45 -05:00
Daniel C. Casimiro	4d2f8dbfee	Remove the path components from the URL sent as origin This fixes issue #287. The origin is a URI indicating the server from which the request initiated. It does not include any path information, but only the server name.	2016-11-22 08:53:45 -05:00
Robin Johnson	126c021e61	fixed malloc failure by draining autorelease pool with every dequeuing operation	2016-11-21 19:14:20 -07:00
daltoniam	c13584b99c	bumped spec	2016-11-14 22:29:34 -06:00
Dalton	178c3e8a49	Merge pull request #277 from nuclearace/master Fix Swift package manager	2016-11-01 18:57:49 -05:00
Erik	ccc1b703dd	Fix Swift package manager	2016-10-30 19:47:58 -04:00
daltoniam	1b64f78542	version bump	2016-10-26 20:41:30 -05:00
Dalton	549500a503	Merge pull request #253 from noremac/master Only disable SSL cert validation if we are using a secure scheme.	2016-10-26 20:26:58 -05:00
Dalton	22d57dca07	Merge pull request #276 from profer/master Enable custom trust validation	2016-10-26 20:26:30 -05:00
daltoniam	dd5119cfce	fix for #261	2016-10-26 20:25:39 -05:00
Wolfgang Profer	a6b2e4329b	Enable custom trust validation Change WebSocket to use a protocol for trust validation instead of SSLSecurity directly. This allows users of Starscream to supply their own validation logic.	2016-10-24 13:43:44 +02:00
Dalton	931e3ba8ae	Merge pull request #266 from fjcaetano/master 'Open'ing classes	2016-10-11 23:23:09 -05:00
Dalton	7476f5196e	Merge pull request #267 from Dipak99041012/2.0.0HotFixes [Fixup] crash for SSL Pinning Strange crash	2016-10-11 23:20:28 -05:00
Dipak Kasabwala	20285cce97	[Fixup] crash for SSL Pinning Strange crash	2016-10-10 18:14:01 -04:00
Flávio Caetano	8e1de1d475	'Open'ing classes	2016-10-10 17:47:13 -03:00
Cameron Pulsford	acf64adc24	Only disable SSL cert validation if we are using a secure scheme.	2016-09-30 14:49:26 -04:00
Dalton	b0fa08cde4	Merge pull request #259 from robinkunde/master Improve clarity of asyncAfter code and other timeout	2016-09-30 13:34:49 -05:00
Dalton	9d32864ab4	Merge pull request #260 from ujell/master Fixed parameter names in documentation	2016-09-30 13:02:28 -05:00
Yücel Uzun	7ef2bc41e0	Fixed parameter names in documentation	2016-09-29 18:50:22 +02:00
Robin Kunde	24e32a78e3	improve clarity of asyncAfter code and other timeout	2016-09-28 12:27:48 -04:00
@@ -1 +1 @@
 .0
 .1