improved native engine and a few bug fixes

Merge pull request #697 from mikaryyn/feature/v4-refactor
Fix for a buffer overflow when close code has not been received from the socket
2020-04-06 14:29:55 -05:00 · 2020-04-06 14:16:00 -05:00 · 2020-04-04 14:28:42 -05:00 · 2020-04-04 13:57:40 -05:00 · 2020-04-04 13:57:16 -05:00 · 2020-03-27 17:54:35 +01:00
51 changed files with 3469 additions and 2411 deletions
@@ -1,4 +1,4 @@
-osx_image: xcode10
+osx_image: xcode11.3
 language: objective-c
 before_install:
  - gem install cocoapods --pre
@@ -2,6 +2,32 @@
 All notable changes to this project will be documented in this file.
 `Starscream` adheres to [Semantic Versioning](http://semver.org/).

+### [4.0.1](https://github.com/daltoniam/Starscream/tree/4.0.1)
+
+Bug fixes for 4.0.0. Enabled Native engine now that the API is out of beta and works properly.
+
+[#749](https://github.com/daltoniam/Starscream/pull/749)
+[#755](https://github.com/daltoniam/Starscream/pull/755)
+
+### [4.0.0](https://github.com/daltoniam/Starscream/tree/4.0.0)
+
+Major API refactor.
+
+### [3.1.1](https://github.com/daltoniam/Starscream/tree/3.1.1)
+
+Small version number fix for 3.1.0: [#703](https://github.com/daltoniam/Starscream/issues/703)
+
+### [3.1.0](https://github.com/daltoniam/Starscream/tree/3.1.0)
+
+* Swift 5.0 and Xcode 10.2 support
+
+#### [3.0.6](https://github.com/daltoniam/Starscream/tree/3.0.6)
+
+* Swift 4.2 and Xcode 10 support
+* added pongDelegate
+* moved CommonCrypto and zlib dependencies
+* HTTP proxy support
+
 #### [3.0.5](https://github.com/daltoniam/Starscream/tree/3.0.5)

 Swift 4.1 support and bug fixes.
@@ -142,14 +168,14 @@ Warning fixes for Swift 3.1

 Fix for the Swift Package Manager.

-Fixed: 
+Fixed:
 [#277](https://github.com/daltoniam/Starscream/issues/277)

 #### [2.0.1](https://github.com/daltoniam/Starscream/tree/2.0.1)

 Bug fixes.

-Fixed: 
+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)
@@ -160,7 +186,7 @@ Fixed:

 Added Swift 3 support.

-Fixed: 
+Fixed:
 [#229](https://github.com/daltoniam/Starscream/issues/229)
 [#232](https://github.com/daltoniam/Starscream/issues/232)

@@ -170,7 +196,7 @@ Swift 2.3 support.

 #### [1.1.3](https://github.com/daltoniam/Starscream/tree/1.1.3)

-Changed: 
+Changed:
 [#170](https://github.com/daltoniam/Starscream/issues/170)
 [#171](https://github.com/daltoniam/Starscream/issues/171)
 [#174](https://github.com/daltoniam/Starscream/issues/174)
@@ -179,14 +205,14 @@ Changed:

 #### [1.1.2](https://github.com/daltoniam/Starscream/tree/1.1.2)

-Fixed: 
+Fixed:
 [#158](https://github.com/daltoniam/Starscream/issues/158)
 [#161](https://github.com/daltoniam/Starscream/issues/161)
 [#164](https://github.com/daltoniam/Starscream/issues/164)

 #### [1.1.1](https://github.com/daltoniam/Starscream/tree/1.1.1)

-Fixed: 
+Fixed:
 [#157](https://github.com/daltoniam/Starscream/issues/157)

 #### [1.1.0](https://github.com/daltoniam/Starscream/tree/1.1.0)
@@ -194,7 +220,7 @@ Fixed:
 Changed:
 Moved over to Runloop/default GCD queues to shared queue.

-Fixed: 
+Fixed:
 [#153](https://github.com/daltoniam/Starscream/issues/153)
 [#151](https://github.com/daltoniam/Starscream/issues/151)
 [#150](https://github.com/daltoniam/Starscream/issues/150)
@@ -1,4 +1,4 @@
 source "https://rubygems.org"

 gem "fastlane"
-gem "cocoapods", ">= 1.6.0.beta.1"
+gem "cocoapods"
@@ -1,47 +1,52 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.10)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.1)
      i18n (~> 0.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
    atomos (0.1.3)
-    babosa (1.0.2)
-    claide (1.0.2)
-    cocoapods (1.6.0.beta.1)
+    babosa (1.0.3)
+    claide (1.0.3)
+    cocoapods (1.8.4)
      activesupport (>= 4.0.2, < 5)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.0.beta.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.1, < 2.0)
+      cocoapods-core (= 1.8.4)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
      cocoapods-search (>= 1.0.0, < 2.0)
      cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
      cocoapods-try (>= 1.1.0, < 2.0)
      colored2 (~> 3.1)
      escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
      gh_inspector (~> 1.0)
      molinillo (~> 0.6.6)
      nap (~> 1.0)
-      ruby-macho (~> 1.2)
-      xcodeproj (>= 1.6.0, < 2.0)
-    cocoapods-core (1.6.0.beta.1)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
      fuzzy_match (~> 2.0.4)
      nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.3.0)
    cocoapods-plugins (1.0.0)
      nap
    cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
      nap (>= 0.8, < 2.0)
      netrc (~> 0.11)
    cocoapods-try (1.1.0)
@@ -49,101 +54,112 @@ GEM
    colored2 (3.1.2)
    commander-fastlane (4.4.6)
      highline (~> 1.7.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
    declarative (0.0.10)
    declarative-option (0.1.0)
-    domain_name (0.5.20180417)
+    digest-crc (0.4.1)
+    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.5.0)
-    emoji_regex (0.1.1)
+    dotenv (2.7.5)
+    emoji_regex (1.0.1)
    escape (0.0.4)
-    excon (0.62.0)
-    faraday (0.15.3)
+    excon (0.71.1)
+    faraday (0.17.3)
      multipart-post (>= 1.2, < 3)
    faraday-cookie_jar (0.0.6)
      faraday (>= 0.7.4)
      http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.13.1)
      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.4)
-    fastlane (2.105.2)
+    fastimage (2.1.7)
+    fastlane (2.139.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.3, < 3.0.0)
      babosa (>= 1.0.2, < 2.0.0)
-      bundler (>= 1.12.0, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
      colored
      commander-fastlane (>= 4.4.6, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (~> 0.1)
-      excon (>= 0.45.0, < 1.0.0)
-      faraday (~> 0.9)
+      emoji_regex (>= 0.1, < 2.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 0.17)
      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.9)
+      faraday_middleware (~> 0.13.1)
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
      highline (>= 1.7.2, < 2.0.0)
      json (< 3.0.0)
-      mini_magick (~> 4.5.1)
-      multi_json
+      jwt (~> 2.1.0)
+      mini_magick (>= 4.9.4, < 5.0.0)
      multi_xml (~> 0.5)
      multipart-post (~> 2.0.0)
      plist (>= 3.1.0, < 4.0.0)
      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.2, < 2.0.0)
+      rubyzip (>= 1.3.0, < 2.0.0)
      security (= 0.1.3)
      simctl (~> 1.6.3)
      slack-notifier (>= 2.0.0, < 3.0.0)
-      terminal-notifier (>= 1.6.2, < 2.0.0)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.6.0, < 2.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
-    fourflusher (2.0.1)
+    fourflusher (2.3.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
-    google-api-client (0.23.9)
+    google-api-client (0.36.3)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (~> 0.9)
      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
-    googleauth (0.6.6)
+      signet (~> 0.12)
+    google-cloud-core (1.4.1)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.3.0)
+      faraday (~> 0.11)
+    google-cloud-storage (1.25.0)
+      addressable (~> 2.5)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.10.0)
      faraday (~> 0.12)
      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.12)
    highline (1.7.10)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.3.0)
    jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mini_magick (4.5.1)
-    minitest (5.11.3)
+    memoist (0.16.2)
+    mini_magick (4.9.5)
+    mini_mime (1.0.2)
+    minitest (5.13.0)
    molinillo (0.6.6)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
    multi_xml (0.6.0)
    multipart-post (2.0.0)
    nanaimo (0.2.6)
    nap (1.1.0)
    naturally (2.2.0)
    netrc (0.11.0)
-    os (1.0.0)
-    plist (3.4.0)
+    os (1.0.1)
+    plist (3.5.0)
    public_suffix (2.0.5)
    representable (3.0.4)
      declarative (< 0.1.0)
@@ -151,35 +167,35 @@ GEM
      uber (< 0.2.0)
    retriable (3.1.2)
    rouge (2.0.7)
-    ruby-macho (1.3.1)
-    rubyzip (1.2.2)
+    ruby-macho (1.4.0)
+    rubyzip (1.3.0)
    security (0.1.3)
-    signet (0.10.0)
+    signet (0.12.0)
      addressable (~> 2.3)
      faraday (~> 0.9)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    simctl (1.6.5)
+    simctl (1.6.7)
      CFPropertyList
      naturally
    slack-notifier (2.3.2)
-    terminal-notifier (1.8.0)
+    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
    thread_safe (0.3.6)
-    tty-cursor (0.6.0)
-    tty-screen (0.6.5)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
-    tzinfo (1.2.5)
+    tty-cursor (0.7.0)
+    tty-screen (0.7.0)
+    tty-spinner (0.9.2)
+      tty-cursor (~> 0.7)
+    tzinfo (1.2.6)
      thread_safe (~> 0.1)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.6.0)
    word_wrap (1.0.0)
-    xcodeproj (1.6.0)
+    xcodeproj (1.14.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@@ -194,8 +210,8 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  cocoapods (>= 1.6.0.beta.1)
+  cocoapods
  fastlane

 BUNDLED WITH
-   1.16.1
+   2.1.3
@@ -1,7 +1,15 @@
 {
  "object": {
    "pins": [
-
+      {
+        "package": "swift-nio-zlib-support",
+        "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
+        "state": {
+          "branch": null,
+          "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
+          "version": "1.0.0"
+        }
+      }
    ]
  },
  "version": 1
@@ -27,8 +27,11 @@ let package = Package(
        products: [
            .library(name: "Starscream", targets: ["Starscream"])
        ],
-        dependencies: [],
+        dependencies: [
+          .package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0")
+        ],
        targets: [
-            .target(name: "Starscream")
+            .target(name: "Starscream",
+                    path: "Sources")
        ]
 )
@@ -1,8 +1,6 @@
 ![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.
-
-Its Objective-C counterpart can be found here: [Jetfire](https://github.com/acmacalister/jetfire)
+Starscream is a conforming WebSocket ([RFC 6455](http://tools.ietf.org/html/rfc6455)) library in Swift.

 ## Features

@@ -10,9 +8,8 @@ Its Objective-C counterpart can be found here: [Jetfire](https://github.com/acma
 - 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.

-## Example
+### Import the framework

 First thing is to import the framework. See the Installation instructions on how to add the framework to your project.

@@ -20,94 +17,65 @@ First thing is to import the framework. See the Installation instructions on how
 import Starscream
 ```

+### Connect to the WebSocket Server
+
 Once imported, you can open a connection to your WebSocket server. Note that `socket` is probably best as a property, so it doesn't get deallocated right after being setup.

 ```swift
-socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
+var request = URLRequest(url: URL(string: "http://localhost:8080")!)
+request.timeoutInterval = 5
+socket = WebSocket(request: request)
 socket.delegate = self
 socket.connect()
 ```

-After you are connected, there are some delegate methods that we need to implement.
+After you are connected, there is either a delegate or closure you can use for process WebSocket events.

-### websocketDidConnect
+### Receiving data from a WebSocket

-websocketDidConnect is called as soon as the client connects to the server.
+`didReceive` receives all the WebSocket events in a single easy to handle enum.

 ```swift
-func websocketDidConnect(socket: WebSocketClient) {
-    print("websocket is connected")
+func didReceive(event: WebSocketEvent, client: WebSocket) {
+	switch event {
+	case .connected(let headers):
+		isConnected = true
+		print("websocket is connected: \(headers)")
+	case .disconnected(let reason, let code):
+		isConnected = false
+		print("websocket is disconnected: \(reason) with code: \(code)")
+	case .text(let string):
+		print("Received text: \(string)")
+	case .binary(let data):
+		print("Received data: \(data.count)")
+	case .ping(_):
+		break
+	case .pong(_):
+		break
+	case .viabilityChanged(_):
+		break
+	case .reconnectSuggested(_):
+		break
+	case .cancelled:
+		isConnected = false
+	case .error(let error):
+		isConnected = false
+		handleError(error)
+	}
 }
 ```

-### websocketDidDisconnect
-
-websocketDidDisconnect is called as soon as the client is disconnected from the server.
+The closure of this would be:

 ```swift
-func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
-	print("websocket is disconnected: \(error?.localizedDescription)")
+socket.onEvent = { event in
+	switch event {
+		// handle events just like above...
+	}
 }
 ```

-### websocketDidReceiveMessage
-
-websocketDidReceiveMessage is called when the client gets a text frame from the connection.
-
-```swift
-func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
-	print("got some text: \(text)")
-}
-```
-
-### websocketDidReceiveData
-
-websocketDidReceiveData is called when the client gets a binary frame from the connection.
-
-```swift
-func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
-	print("got some data: \(data.count)")
-}
-```
-
-### Optional: websocketDidReceivePong *(required protocol: WebSocketPongDelegate)*
-
-websocketDidReceivePong is called when the client gets a pong response from the connection. You need to implement the WebSocketPongDelegate protocol and set an additional delegate, eg: ` socket.pongDelegate = self`
-
-```swift
-func websocketDidReceivePong(socket: WebSocketClient, data: Data?) {
-	print("Got pong! Maybe some data: \(data?.count)")
-}
-```
-
-Or you can use closures.
-
-```swift
-socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
-//websocketDidConnect
-socket.onConnect = {
-    print("websocket is connected")
-}
-//websocketDidDisconnect
-socket.onDisconnect = { (error: Error?) in
-    print("websocket is disconnected: \(error?.localizedDescription)")
-}
-//websocketDidReceiveMessage
-socket.onText = { (text: String) in
-    print("got some text: \(text)")
-}
-//websocketDidReceiveData
-socket.onData = { (data: Data) in
-    print("got some data: \(data.count)")
-}
-//you could do onPong as well.
-socket.connect()
-```
-
-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?
+### Writing to a WebSocket

 ### write a binary frame

@@ -160,98 +128,49 @@ The disconnect method does what you would expect and closes the socket.
 socket.disconnect()
 ```

-The socket can be forcefully closed, by specifying a timeout (in milliseconds). A timeout of zero will also close the socket immediately without waiting on the server.
+The disconnect method can also send a custom close code if desired.

 ```swift
-socket.disconnect(forceTimeout: 10, closeCode: CloseCode.normal.rawValue)
+socket.disconnect(closeCode: CloseCode.normal.rawValue)
 ```

-### isConnected
+### Custom Headers, Protocols and Timeout

-Returns if the socket is connected or not.
-
-```swift
-if socket.isConnected {
-  // do cool stuff.
-}
-```
-
-### Custom Headers
-
-You can also override the default websocket headers with your own custom ones like so:
+You can override the default websocket headers, add your own custom ones and set a timeout:

 ```swift
 var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
-request.timeoutInterval = 5
+request.timeoutInterval = 5 // Sets the timeout for the connection
 request.setValue("someother protocols", forHTTPHeaderField: "Sec-WebSocket-Protocol")
 request.setValue("14", forHTTPHeaderField: "Sec-WebSocket-Version")
+request.setValue("chat,superchat", forHTTPHeaderField: "Sec-WebSocket-Protocol")
 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
-
-If you need to specify a protocol, simple add it to the init:
-
-```swift
-//chat and superchat are the example protocols here
-socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
-socket.delegate = self
-socket.connect()
-```
-
-### Self Signed SSL
-
-```swift
-socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
-
-//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.

-```swift
-socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
-let data = ... //load your certificate from disk
-socket.security = SSLSecurity(certs: [SSLCert(data: data)], usePublicKeys: true)
-//socket.security = SSLSecurity() //uses the .cer files in your app's bundle
-```
-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. 
+Allow Self-signed certificates:

 ```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] 
+var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
+let pinner = FoundationSecurity(allowSelfSigned: true) // don't validate SSL certificates
+let socket = WebSocket(request: request, certPinner: pinner)
 ```

-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.
+TODO: Update docs on how to load certificates and public keys into an app bundle, use the builtin pinner and TrustKit.

 ### 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
+var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
+let compression = WSCompression()
+let socket = WebSocket(request: request, compressionHandler: compression)
 ```

 Compression should be disabled if your application is transmitting already-compressed, random, or other uncompressable data.
@@ -272,7 +191,7 @@ Check out the SimpleTest project in the examples directory to see how to setup a

 ## Requirements

-Starscream works with iOS 7/OSX 10.9 or above. It is recommended to use iOS 8/10.10 or above for CocoaPods/framework support. To use Starscream with a project targeting iOS 7, you must include all Swift files directly in your project.
+Starscream works with iOS 8/10.10 or above for CocoaPods/framework support. To use Starscream with a project targeting iOS 7, you must include all Swift files directly in your project.

 ## Installation

@@ -286,7 +205,7 @@ To use Starscream in your project add the following 'Podfile' to your project
 	platform :ios, '9.0'
 	use_frameworks!

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

 Then run:

@@ -308,9 +227,32 @@ $ brew install carthage
 To integrate Starscream into your Xcode project using Carthage, specify it in your `Cartfile`:

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

+### Accio
+
+Check out the [Accio](https://github.com/JamitLabs/Accio) docs on how to add a install. 
+
+Add the following to your Package.swift:
+
+```swift
+.package(url: "https://github.com/daltoniam/Starscream.git", .upToNextMajor(from: "4.0.0")),
+```
+
+Next, add `Starscream` to your App targets dependencies like so:
+
+```swift
+.target(
+    name: "App",
+    dependencies: [
+        "Starscream",
+    ]
+),
+```
+
+Then run `accio update`.
+
 ### Rogue

 First see the [installation docs](https://github.com/acmacalister/Rogue) for how to install Rogue.
@@ -331,7 +273,7 @@ Once you have your Swift package set up, adding Starscream as a dependency is as

 ```swift
 dependencies: [
-    .Package(url: "https://github.com/daltoniam/Starscream.git", majorVersion: 3)
+    .Package(url: "https://github.com/daltoniam/Starscream.git", majorVersion: 4)
 ]
 ```

@@ -345,54 +287,9 @@ 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

- [ ] Add Unit Tests - Local WebSocket server that runs against Autobahn
+- [ ] Proxy support

 ## License

@@ -0,0 +1,29 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Compression.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 2/4/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public protocol CompressionHandler {
+    func load(headers: [String: String])
+    func decompress(data: Data, isFinal: Bool) -> Data?
+    func compress(data: Data) -> Data?
+}
@@ -1,9 +1,9 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////
 //
-//  Compression.swift
+//  WSCompression.swift
 //
 //  Created by Joseph Ross on 7/16/14.
-//  Copyright © 2017 Joseph Ross.
+//  Copyright © 2017 Joseph Ross & Vluxe. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -29,13 +29,81 @@
 import Foundation
 import zlib

+public class WSCompression: CompressionHandler {
+    let headerWSExtensionName = "Sec-WebSocket-Extensions"
+    var decompressor: Decompressor?
+    var compressor: Compressor?
+    var decompressorTakeOver = false
+    var compressorTakeOver = false
+    
+    public init() {
+        
+    }
+    
+    public func load(headers: [String: String]) {
+        guard let extensionHeader = headers[headerWSExtensionName] else { return }
+        decompressorTakeOver = false
+        compressorTakeOver = false
+        
+        let parts = extensionHeader.components(separatedBy: ";")
+        for p in parts {
+            let part = p.trimmingCharacters(in: .whitespaces)
+            if part.hasPrefix("server_max_window_bits=") {
+                let valString = part.components(separatedBy: "=")[1]
+                if let val = Int(valString.trimmingCharacters(in: .whitespaces)) {
+                    decompressor = Decompressor(windowBits: val)
+                }
+            } else if part.hasPrefix("client_max_window_bits=") {
+                let valString = part.components(separatedBy: "=")[1]
+                if let val = Int(valString.trimmingCharacters(in: .whitespaces)) {
+                    compressor = Compressor(windowBits: val)
+                }
+            } else if part == "client_no_context_takeover" {
+                compressorTakeOver = true
+            } else if part == "server_no_context_takeover" {
+                decompressorTakeOver = true
+            }
+        }
+    }
+    
+    public func decompress(data: Data, isFinal: Bool) -> Data? {
+        guard let decompressor = decompressor else { return nil }
+        do {
+            let decompressedData = try decompressor.decompress(data, finish: isFinal)
+            if decompressorTakeOver {
+                try decompressor.reset()
+            }
+            return decompressedData
+        } catch {
+            //do nothing with the error for now
+        }
+        return nil
+    }
+    
+    public func compress(data: Data) -> Data? {
+        guard let compressor = compressor else { return nil }
+        do {
+            let compressedData = try compressor.compress(data)
+            if compressorTakeOver {
+                try compressor.reset()
+            }
+            return compressedData
+        } catch {
+            //do nothing with the error for now
+        }
+        return nil
+    }
+    
+
+}
+
 class Decompressor {
    private var strm = z_stream()
    private var buffer = [UInt8](repeating: 0, count: 0x2000)
    private var inflateInitialized = false
-    private let windowBits:Int
+    private let windowBits: Int

-    init?(windowBits:Int) {
+    init?(windowBits: Int) {
        self.windowBits = windowBits
        guard initInflate() else { return nil }
    }
@@ -56,7 +124,7 @@ class Decompressor {
    }

    func decompress(_ data: Data, finish: Bool) throws -> Data {
-        return try data.withUnsafeBytes { (bytes:UnsafePointer<UInt8>) -> Data in
+        return try data.withUnsafeBytes { (bytes: UnsafePointer<UInt8>) -> Data in
            return try decompress(bytes: bytes, count: data.count, finish: finish)
        }
    }
@@ -71,11 +139,10 @@ class Decompressor {
        }

        return decompressed
-
    }

-    private func decompress(bytes: UnsafePointer<UInt8>, count: Int, out:inout Data) throws {
-        var res:CInt = 0
+    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)

@@ -111,7 +178,7 @@ class Compressor {
    private var strm = z_stream()
    private var buffer = [UInt8](repeating: 0, count: 0x2000)
    private var deflateInitialized = false
-    private let windowBits:Int
+    private let windowBits: Int

    init?(windowBits: Int) {
        self.windowBits = windowBits
@@ -136,7 +203,7 @@ class Compressor {

    func compress(_ data: Data) throws -> Data {
        var compressed = Data()
-        var res:CInt = 0
+        var res: CInt = 0
        data.withUnsafeBytes { (ptr:UnsafePointer<UInt8>) -> Void in
            strm.next_in = UnsafeMutablePointer<UInt8>(mutating: ptr)
            strm.avail_in = CUnsignedInt(data.count)
@@ -174,4 +241,3 @@ class Compressor {
        teardownDeflate()
    }
 }
-
@@ -0,0 +1,57 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Data+Extensions.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 3/27/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  Fix for deprecation warnings
+//
+//  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
+
+internal extension Data {
+    struct ByteError: Swift.Error {}
+    
+    func withUnsafeBytes<ResultType, ContentType>(_ completion: (UnsafePointer<ContentType>) throws -> ResultType) rethrows -> ResultType {
+        #if swift(>=5.0)
+        return try withUnsafeBytes { 
+            if let baseAddress = $0.baseAddress, $0.count > 0 {
+                return try completion(baseAddress.assumingMemoryBound(to: ContentType.self))
+            } else {
+                throw ByteError()
+            }
+        }
+        #else
+        return try withUnsafeBytes(completion)
+        #endif
+    }
+    
+    mutating func withUnsafeMutableBytes<ResultType, ContentType>(_ completion: (UnsafeMutablePointer<ContentType>) throws -> ResultType) rethrows -> ResultType {
+        #if swift(>=5.0)
+        return try withUnsafeMutableBytes {
+            if let baseAddress = $0.baseAddress, $0.count > 0 {
+                return try completion(baseAddress.assumingMemoryBound(to: ContentType.self))
+            } else {
+                throw ByteError()
+            }
+        }
+        #else
+        return try withUnsafeMutableBytes(completion)
+        #endif
+    }
+}
@@ -0,0 +1,22 @@
+//
+//  Engine.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 6/15/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+
+import Foundation
+
+public protocol EngineDelegate: class {
+    func didReceive(event: WebSocketEvent)
+}
+
+public protocol Engine {
+    func register(delegate: EngineDelegate)
+    func start(request: URLRequest)
+    func stop(closeCode: UInt16)
+    func forceStop()
+    func write(data: Data, opcode: FrameOpCode, completion: (() -> ())?)
+    func write(string: String, completion: (() -> ())?)
+}
@@ -0,0 +1,96 @@
+//
+//  NativeEngine.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 6/15/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+
+import Foundation
+
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+public class NativeEngine: NSObject, Engine, URLSessionDataDelegate, URLSessionWebSocketDelegate {
+    private var task: URLSessionWebSocketTask?
+    weak var delegate: EngineDelegate?
+
+    public func register(delegate: EngineDelegate) {
+        self.delegate = delegate
+    }
+
+    public func start(request: URLRequest) {
+        let session = URLSession(configuration: URLSessionConfiguration.default, delegate: self, delegateQueue: nil)
+        task = session.webSocketTask(with: request)
+        doRead()
+        task?.resume()
+    }
+
+    public func stop(closeCode: UInt16) {
+        let closeCode = URLSessionWebSocketTask.CloseCode(rawValue: Int(closeCode)) ?? .normalClosure
+        task?.cancel(with: closeCode, reason: nil)
+    }
+
+    public func forceStop() {
+        stop(closeCode: UInt16(URLSessionWebSocketTask.CloseCode.abnormalClosure.rawValue))
+    }
+
+    public func write(string: String, completion: (() -> ())?) {
+        task?.send(.string(string), completionHandler: { (error) in
+            completion?()
+        })
+    }
+
+    public func write(data: Data, opcode: FrameOpCode, completion: (() -> ())?) {
+        switch opcode {
+        case .binaryFrame:
+            task?.send(.data(data), completionHandler: { (error) in
+                completion?()
+            })
+        case .textFrame:
+            let text = String(data: data, encoding: .utf8)!
+            write(string: text, completion: completion)
+        case .ping:
+            task?.sendPing(pongReceiveHandler: { (error) in
+                completion?()
+            })
+        default:
+            break //unsupported
+        }
+    }
+
+    private func doRead() {
+        task?.receive { [weak self] (result) in
+            switch result {
+            case .success(let message):
+                switch message {
+                case .string(let string):
+                    self?.broadcast(event: .text(string))
+                case .data(let data):
+                    self?.broadcast(event: .binary(data))
+                @unknown default:
+                    break
+                }
+                break
+            case .failure(let error):
+                self?.broadcast(event: .error(error))
+            }
+            self?.doRead()
+        }
+    }
+
+    private func broadcast(event: WebSocketEvent) {
+        delegate?.didReceive(event: event)
+    }
+    
+    public func urlSession(_ session: URLSession, webSocketTask: URLSessionWebSocketTask, didOpenWithProtocol protocol: String?) {
+        let p = `protocol` ?? ""
+        broadcast(event: .connected([HTTPWSHeader.protocolName: p]))
+    }
+    
+    public func urlSession(_ session: URLSession, webSocketTask: URLSessionWebSocketTask, didCloseWith closeCode: URLSessionWebSocketTask.CloseCode, reason: Data?) {
+        var r = ""
+        if let d = reason {
+            r = String(data: d, encoding: .utf8) ?? ""
+        }
+        broadcast(event: .disconnected(r, UInt16(closeCode.rawValue)))
+    }
+}
@@ -0,0 +1,234 @@
+//
+//  WSEngine.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 6/15/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+
+import Foundation
+
+public class WSEngine: Engine, TransportEventClient, FramerEventClient,
+FrameCollectorDelegate, HTTPHandlerDelegate {
+    private let transport: Transport
+    private let framer: Framer
+    private let httpHandler: HTTPHandler
+    private let compressionHandler: CompressionHandler?
+    private let certPinner: CertificatePinning?
+    private let headerChecker: HeaderValidator
+    private var request: URLRequest!
+    
+    private let frameHandler = FrameCollector()
+    private var didUpgrade = false
+    private var secKeyValue = ""
+    private let writeQueue = DispatchQueue(label: "com.vluxe.starscream.writequeue")
+    private let mutex = DispatchSemaphore(value: 1)
+    private var canSend = false
+    
+    weak var delegate: EngineDelegate?
+    public var respondToPingWithPong: Bool = true
+    
+    public init(transport: Transport,
+                certPinner: CertificatePinning? = nil,
+                headerValidator: HeaderValidator = FoundationSecurity(),
+                httpHandler: HTTPHandler = FoundationHTTPHandler(),
+                framer: Framer = WSFramer(),
+                compressionHandler: CompressionHandler? = nil) {
+        self.transport = transport
+        self.framer = framer
+        self.httpHandler = httpHandler
+        self.certPinner = certPinner
+        self.headerChecker = headerValidator
+        self.compressionHandler = compressionHandler
+        framer.updateCompression(supports: compressionHandler != nil)
+        frameHandler.delegate = self
+    }
+    
+    public func register(delegate: EngineDelegate) {
+        self.delegate = delegate
+    }
+    
+    public func start(request: URLRequest) {
+        mutex.wait()
+        let isConnected = canSend
+        mutex.signal()
+        if isConnected {
+            return
+        }
+        
+        self.request = request
+        transport.register(delegate: self)
+        framer.register(delegate: self)
+        httpHandler.register(delegate: self)
+        frameHandler.delegate = self
+        guard let url = request.url else {
+            return
+        }
+        transport.connect(url: url, timeout: request.timeoutInterval, certificatePinning: certPinner)
+    }
+    
+    public func stop(closeCode: UInt16 = CloseCode.normal.rawValue) {
+        let capacity = MemoryLayout<UInt16>.size
+        var pointer = [UInt8](repeating: 0, count: capacity)
+        writeUint16(&pointer, offset: 0, value: closeCode)
+        let payload = Data(bytes: pointer, count: MemoryLayout<UInt16>.size)
+        write(data: payload, opcode: .connectionClose, completion: { [weak self] in
+            self?.reset()
+            self?.forceStop()
+        })
+    }
+    
+    public func forceStop() {
+        transport.disconnect()
+    }
+    
+    public func write(string: String, completion: (() -> ())?) {
+        let data = string.data(using: .utf8)!
+        write(data: data, opcode: .textFrame, completion: completion)
+    }
+    
+    public func write(data: Data, opcode: FrameOpCode, completion: (() -> ())?) {
+        writeQueue.async { [weak self] in
+            guard let s = self else { return }
+            s.mutex.wait()
+            let canWrite = s.canSend
+            s.mutex.signal()
+            if !canWrite {
+                return
+            }
+            
+            var isCompressed = false
+            var sendData = data
+            if let compressedData = s.compressionHandler?.compress(data: data) {
+                sendData = compressedData
+                isCompressed = true
+            }
+            
+            let frameData = s.framer.createWriteFrame(opcode: opcode, payload: sendData, isCompressed: isCompressed)
+            s.transport.write(data: frameData, completion: {_ in
+                completion?()
+            })
+        }
+    }
+    
+    // MARK: - TransportEventClient
+    
+    public func connectionChanged(state: ConnectionState) {
+        switch state {
+        case .connected:
+            secKeyValue = HTTPWSHeader.generateWebSocketKey()
+            let wsReq = HTTPWSHeader.createUpgrade(request: request, supportsCompression: framer.supportsCompression(), secKeyValue: secKeyValue)
+            let data = httpHandler.convert(request: wsReq)
+            transport.write(data: data, completion: {_ in })
+        case .waiting:
+            break
+        case .failed(let error):
+            handleError(error)
+        case .viability(let isViable):
+            broadcast(event: .viabilityChanged(isViable))
+        case .shouldReconnect(let status):
+            broadcast(event: .reconnectSuggested(status))
+        case .receive(let data):
+            if didUpgrade {
+                framer.add(data: data)
+            } else {
+                let offset = httpHandler.parse(data: data)
+                if offset > 0 {
+                    let extraData = data.subdata(in: offset..<data.endIndex)
+                    framer.add(data: extraData)
+                }
+            }
+        case .cancelled:
+            broadcast(event: .cancelled)
+        }
+    }
+    
+    // MARK: - HTTPHandlerDelegate
+    
+    public func didReceiveHTTP(event: HTTPEvent) {
+        switch event {
+        case .success(let headers):
+            if let error = headerChecker.validate(headers: headers, key: secKeyValue) {
+                handleError(error)
+                return
+            }
+            mutex.wait()
+            didUpgrade = true
+            canSend = true
+            mutex.signal()
+            compressionHandler?.load(headers: headers)
+            if let url = request.url {
+                HTTPCookie.cookies(withResponseHeaderFields: headers, for: url).forEach {
+                    HTTPCookieStorage.shared.setCookie($0)
+                }
+            }
+
+            broadcast(event: .connected(headers))
+        case .failure(let error):
+            handleError(error)
+        }
+    }
+    
+    // MARK: - FramerEventClient
+    
+    public func frameProcessed(event: FrameEvent) {
+        switch event {
+        case .frame(let frame):
+            frameHandler.add(frame: frame)
+        case .error(let error):
+            handleError(error)
+        }
+    }
+    
+    // MARK: - FrameCollectorDelegate
+    
+    public func decompress(data: Data, isFinal: Bool) -> Data? {
+        return compressionHandler?.decompress(data: data, isFinal: isFinal)
+    }
+    
+    public func didForm(event: FrameCollector.Event) {
+        switch event {
+        case .text(let string):
+            broadcast(event: .text(string))
+        case .binary(let data):
+            broadcast(event: .binary(data))
+        case .pong(let data):
+            broadcast(event: .pong(data))
+        case .ping(let data):
+            broadcast(event: .ping(data))
+            if respondToPingWithPong {
+                write(data: data ?? Data(), opcode: .pong, completion: nil)
+            }
+        case .closed(let reason, let code):
+            broadcast(event: .disconnected(reason, code))
+            stop(closeCode: code)
+        case .error(let error):
+            handleError(error)
+        }
+    }
+    
+    private func broadcast(event: WebSocketEvent) {
+        delegate?.didReceive(event: event)
+    }
+    
+    //This call can be coming from a lot of different queues/threads.
+    //be aware of that when modifying shared variables
+    private func handleError(_ error: Error?) {
+        if let wsError = error as? WSError {
+            stop(closeCode: wsError.code)
+        } else {
+            stop()
+        }
+        
+        delegate?.didReceive(event: .error(error))
+    }
+    
+    private func reset() {
+        mutex.wait()
+        canSend = false
+        didUpgrade = false
+        mutex.signal()
+    }
+    
+    
+}
@@ -0,0 +1,123 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  FoundationHTTPHandler.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/25/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+#if os(watchOS)
+public typealias FoundationHTTPHandler = StringHTTPHandler
+#else
+public class FoundationHTTPHandler: HTTPHandler {
+
+    var buffer = Data()
+    weak var delegate: HTTPHandlerDelegate?
+    
+    public init() {
+        
+    }
+    
+    public func convert(request: URLRequest) -> Data {
+        let msg = CFHTTPMessageCreateRequest(kCFAllocatorDefault, request.httpMethod! as CFString,
+                                             request.url! as CFURL, kCFHTTPVersion1_1).takeRetainedValue()
+        if let headers = request.allHTTPHeaderFields {
+            for (aKey, aValue) in headers {
+                CFHTTPMessageSetHeaderFieldValue(msg, aKey as CFString, aValue as CFString)
+            }
+        }
+        if let body = request.httpBody {
+            CFHTTPMessageSetBody(msg, body as CFData)
+        }
+        guard let data = CFHTTPMessageCopySerializedMessage(msg) else {
+            return Data()
+        }
+        return data.takeRetainedValue() as Data
+    }
+    
+    public func parse(data: Data) -> Int {
+        let offset = findEndOfHTTP(data: data)
+        if offset > 0 {
+            buffer.append(data.subdata(in: 0..<offset))
+        } else {
+            buffer.append(data)
+        }
+        if parseContent(data: buffer) {
+            buffer = Data()
+        }
+        return offset
+    }
+    
+    //returns true when the buffer should be cleared
+    func parseContent(data: Data) -> Bool {
+        var pointer = [UInt8]()
+        data.withUnsafeBytes { pointer.append(contentsOf: $0) }
+
+        let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, false).takeRetainedValue()
+        if !CFHTTPMessageAppendBytes(response, pointer, data.count) {
+            return false //not enough data, wait for more
+        }
+        if !CFHTTPMessageIsHeaderComplete(response) {
+            return false //not enough data, wait for more
+        }
+        
+        let code = CFHTTPMessageGetResponseStatusCode(response)
+        if code != HTTPWSHeader.switchProtocolCode {
+            delegate?.didReceiveHTTP(event: .failure(HTTPUpgradeError.notAnUpgrade(code)))
+            return true
+        }
+        
+        if let cfHeaders = CFHTTPMessageCopyAllHeaderFields(response) {
+            let nsHeaders = cfHeaders.takeRetainedValue() as NSDictionary
+            var headers = [String: String]()
+            for (key, value) in nsHeaders {
+                if let key = key as? String, let value = value as? String {
+                    headers[key] = value
+                }
+            }
+            delegate?.didReceiveHTTP(event: .success(headers))
+            return true
+        }
+        
+        delegate?.didReceiveHTTP(event: .failure(HTTPUpgradeError.invalidData))
+        return true
+    }
+    
+    public func register(delegate: HTTPHandlerDelegate) {
+        self.delegate = delegate
+    }
+    
+    private func findEndOfHTTP(data: Data) -> Int {
+        let endBytes = [UInt8(ascii: "\r"), UInt8(ascii: "\n"), UInt8(ascii: "\r"), UInt8(ascii: "\n")]
+        var pointer = [UInt8]()
+        data.withUnsafeBytes { pointer.append(contentsOf: $0) }
+        var k = 0
+        for i in 0..<data.count {
+            if pointer[i] == endBytes[k] {
+                k += 1
+                if k == 4 {
+                    return i + 1
+                }
+            } else {
+                k = 0
+            }
+        }
+        return -1
+    }
+}
+#endif
@@ -0,0 +1,99 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  FoundationHTTPHandler.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 4/2/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public class FoundationHTTPServerHandler: HTTPServerHandler {
+    var buffer = Data()
+    weak var delegate: HTTPServerDelegate?
+    let getVerb: NSString = "GET"
+    
+    public func register(delegate: HTTPServerDelegate) {
+        self.delegate = delegate
+    }
+    
+    public func createResponse(headers: [String: String]) -> Data {
+        #if os(watchOS)
+        //TODO: build response header
+        return Data()
+        #else
+        let response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, HTTPWSHeader.switchProtocolCode,
+                                                   nil, kCFHTTPVersion1_1).takeRetainedValue()
+        
+        //TODO: add other values to make a proper response here...
+        //TODO: also sec key thing (Sec-WebSocket-Key)
+        for (key, value) in headers {
+            CFHTTPMessageSetHeaderFieldValue(response, key as CFString, value as CFString)
+        }
+        guard let cfData = CFHTTPMessageCopySerializedMessage(response)?.takeRetainedValue() else {
+            return Data()
+        }
+        return cfData as Data
+        #endif
+    }
+    
+    public func parse(data: Data) {
+        buffer.append(data)
+        if parseContent(data: buffer) {
+            buffer = Data()
+        }
+    }
+    
+    //returns true when the buffer should be cleared
+    func parseContent(data: Data) -> Bool {
+        var pointer = [UInt8]()
+        data.withUnsafeBytes { pointer.append(contentsOf: $0) }
+        #if os(watchOS)
+        //TODO: parse data
+        return false
+        #else
+        let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, true).takeRetainedValue()
+        if !CFHTTPMessageAppendBytes(response, pointer, data.count) {
+            return false //not enough data, wait for more
+        }
+        if !CFHTTPMessageIsHeaderComplete(response) {
+            return false //not enough data, wait for more
+        }
+        if let method = CFHTTPMessageCopyRequestMethod(response)?.takeRetainedValue() {
+            if method != getVerb {
+                delegate?.didReceive(event: .failure(HTTPUpgradeError.invalidData))
+                return true
+            }
+        }
+        
+        if let cfHeaders = CFHTTPMessageCopyAllHeaderFields(response) {
+            let nsHeaders = cfHeaders.takeRetainedValue() as NSDictionary
+            var headers = [String: String]()
+            for (key, value) in nsHeaders {
+                if let key = key as? String, let value = value as? String {
+                    headers[key] = value
+                }
+            }
+            delegate?.didReceive(event: .success(headers))
+            return true
+        }
+        
+        delegate?.didReceive(event: .failure(HTTPUpgradeError.invalidData))
+        return true
+        #endif
+    }
+}
@@ -0,0 +1,111 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  FrameCollector.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/24/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public protocol FrameCollectorDelegate: class {
+    func didForm(event: FrameCollector.Event)
+    func decompress(data: Data, isFinal: Bool) -> Data?
+}
+
+public class FrameCollector {
+    public enum Event {
+        case text(String)
+        case binary(Data)
+        case pong(Data?)
+        case ping(Data?)
+        case error(Error)
+        case closed(String, UInt16)
+    }
+    weak var delegate: FrameCollectorDelegate?
+    var buffer = Data()
+    var frameCount = 0
+    var isText = false //was the first frame a text frame or a binary frame?
+    var needsDecompression = false
+    
+    public func add(frame: Frame) {
+        //check single frame action and out of order frames
+        if frame.opcode == .connectionClose {
+            var code = frame.closeCode
+            var reason = "connection closed by server"
+            if let customCloseReason = String(data: frame.payload, encoding: .utf8) {
+                reason = customCloseReason
+            } else {
+                code = CloseCode.protocolError.rawValue
+            }
+            delegate?.didForm(event: .closed(reason, code))
+            return
+        } else if frame.opcode == .pong {
+            delegate?.didForm(event: .pong(frame.payload))
+            return
+        } else if frame.opcode == .ping {
+            delegate?.didForm(event: .ping(frame.payload))
+            return
+        } else if frame.opcode == .continueFrame && frameCount == 0 {
+            let errCode = CloseCode.protocolError.rawValue
+            delegate?.didForm(event: .error(WSError(type: .protocolError, message: "first frame can't be a continue frame", code: errCode)))
+            reset()
+            return
+        } else if frameCount > 0 && frame.opcode != .continueFrame {
+            let errCode = CloseCode.protocolError.rawValue
+            delegate?.didForm(event: .error(WSError(type: .protocolError, message: "second and beyond of fragment message must be a continue frame", code: errCode)))
+            reset()
+            return
+        }
+        if frameCount == 0 {
+            isText = frame.opcode == .textFrame
+            needsDecompression = frame.needsDecompression
+        }
+        
+        let payload: Data
+        if needsDecompression {
+            payload = delegate?.decompress(data: frame.payload, isFinal: frame.isFin) ?? frame.payload
+        } else {
+            payload = frame.payload
+        }
+        buffer.append(payload)
+        frameCount += 1
+        if isText {
+            if String(data: buffer, encoding: .utf8) == nil {
+                let errCode = CloseCode.protocolError.rawValue
+                delegate?.didForm(event: .error(WSError(type: .protocolError, message: "not valid UTF-8 data", code: errCode)))
+                reset()
+                return
+            }
+        }
+        
+        if frame.isFin {
+            if isText {
+                let string = String(data: buffer, encoding: .utf8) ?? ""
+                delegate?.didForm(event: .text(string))
+            } else {
+                delegate?.didForm(event: .binary(buffer))
+            }
+            reset()
+        }
+    }
+    
+    func reset() {
+        buffer = Data()
+        frameCount = 0
+    }
+}
@@ -0,0 +1,365 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Framer.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/23/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+let FinMask: UInt8          = 0x80
+let OpCodeMask: UInt8       = 0x0F
+let RSVMask: UInt8          = 0x70
+let RSV1Mask: UInt8         = 0x40
+let MaskMask: UInt8         = 0x80
+let PayloadLenMask: UInt8   = 0x7F
+let MaxFrameSize: Int       = 32
+
+// Standard WebSocket close codes
+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 enum FrameOpCode: 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.
+    case unknown = 100
+}
+
+public struct Frame {
+    let isFin: Bool
+    let needsDecompression: Bool
+    let isMasked: Bool
+    let opcode: FrameOpCode
+    let payloadLength: UInt64
+    let payload: Data
+    let closeCode: UInt16 //only used by connectionClose opcode
+}
+
+public enum FrameEvent {
+    case frame(Frame)
+    case error(Error)
+}
+
+public protocol FramerEventClient: class {
+    func frameProcessed(event: FrameEvent)
+}
+
+public protocol Framer {
+    func add(data: Data)
+    func register(delegate: FramerEventClient)
+    func createWriteFrame(opcode: FrameOpCode, payload: Data, isCompressed: Bool) -> Data
+    func updateCompression(supports: Bool)
+    func supportsCompression() -> Bool
+}
+
+public class WSFramer: Framer {
+    private let queue = DispatchQueue(label: "com.vluxe.starscream.wsframer", attributes: [])
+    private weak var delegate: FramerEventClient?
+    private var buffer = Data()
+    public var compressionEnabled = false
+    private let isServer: Bool
+    
+    public init(isServer: Bool = false) {
+        self.isServer = isServer
+    }
+    
+    public func updateCompression(supports: Bool) {
+        compressionEnabled = supports
+    }
+    
+    public func supportsCompression() -> Bool {
+        return compressionEnabled
+    }
+    
+    enum ProcessEvent {
+        case needsMoreData
+        case processedFrame(Frame, Int)
+        case failed(Error)
+    }
+    
+    public func add(data: Data) {
+        queue.async { [weak self] in
+            self?.buffer.append(data)
+            while(true) {
+               let event = self?.process() ?? .needsMoreData
+                switch event {
+                case .needsMoreData:
+                    return
+                case .processedFrame(let frame, let split):
+                    guard let s = self else { return }
+                    s.delegate?.frameProcessed(event: .frame(frame))
+                    if split >= s.buffer.count {
+                        s.buffer = Data()
+                        return
+                    }
+                    s.buffer = s.buffer.advanced(by: split)
+                case .failed(let error):
+                    self?.delegate?.frameProcessed(event: .error(error))
+                    self?.buffer = Data()
+                    return
+                }
+            }
+        }
+    }
+
+    public func register(delegate: FramerEventClient) {
+        self.delegate = delegate
+    }
+    
+    private func process() -> ProcessEvent {
+        if buffer.count < 2 {
+            return .needsMoreData
+        }
+        var pointer = [UInt8]()
+        buffer.withUnsafeBytes { pointer.append(contentsOf: $0) }
+
+        let isFin = (FinMask & pointer[0])
+        let opcodeRawValue = (OpCodeMask & pointer[0])
+        let opcode = FrameOpCode(rawValue: opcodeRawValue) ?? .unknown
+        let isMasked = (MaskMask & pointer[1])
+        let payloadLen = (PayloadLenMask & pointer[1])
+        let RSV1 = (RSVMask & pointer[0])
+        var needsDecompression = false
+        
+        if compressionEnabled && opcode != .continueFrame {
+           needsDecompression = (RSV1Mask & pointer[0]) > 0
+        }
+        if !isServer && (isMasked > 0 || RSV1 > 0) && opcode != .pong && !needsDecompression {
+            let errCode = CloseCode.protocolError.rawValue
+            return .failed(WSError(type: .protocolError, message: "masked and rsv data is not currently supported", code: errCode))
+        }
+        let isControlFrame = (opcode == .connectionClose || opcode == .ping)
+        if !isControlFrame && (opcode != .binaryFrame && opcode != .continueFrame &&
+            opcode != .textFrame && opcode != .pong) {
+            let errCode = CloseCode.protocolError.rawValue
+            return .failed(WSError(type: .protocolError, message: "unknown opcode: \(opcodeRawValue)", code: errCode))
+        }
+        if isControlFrame && isFin == 0 {
+            let errCode = CloseCode.protocolError.rawValue
+            return .failed(WSError(type: .protocolError, message: "control frames can't be fragmented", code: errCode))
+        }
+        
+        var offset = 2
+    
+        if isControlFrame && payloadLen > 125 {
+            return .failed(WSError(type: .protocolError, message: "payload length is longer than allowed for a control frame", code: CloseCode.protocolError.rawValue))
+        }
+        
+        var dataLength = UInt64(payloadLen)
+        var closeCode = CloseCode.normal.rawValue
+        if opcode == .connectionClose {
+            if payloadLen == 1 {
+                closeCode = CloseCode.protocolError.rawValue
+                dataLength = 0
+            } else if payloadLen > 1 {
+                if pointer.count < 4 {
+                    return .needsMoreData
+                }
+                let size = MemoryLayout<UInt16>.size
+                closeCode = pointer.readUint16(offset: offset)
+                offset += size
+                dataLength -= UInt64(size)
+                if closeCode < 1000 || (closeCode > 1003 && closeCode < 1007) || (closeCode > 1013 && closeCode < 3000) {
+                    closeCode = CloseCode.protocolError.rawValue
+                }
+            }
+        }
+        
+        if payloadLen == 127 {
+             let size = MemoryLayout<UInt64>.size
+            if size + offset > pointer.count {
+                return .needsMoreData
+            }
+            dataLength = pointer.readUint64(offset: offset)
+            offset += size
+        } else if payloadLen == 126 {
+            let size = MemoryLayout<UInt16>.size
+            if size + offset > pointer.count {
+                return .needsMoreData
+            }
+            dataLength = UInt64(pointer.readUint16(offset: offset))
+            offset += size
+        }
+        
+        let maskStart = offset
+        if isServer {
+            offset += MemoryLayout<UInt32>.size
+        }
+        
+        if dataLength > (pointer.count - offset) {
+            return .needsMoreData
+        }
+        
+        //I don't like this cast, but Data's count returns an Int.
+        //Might be a problem with huge payloads. Need to revisit.
+        let readDataLength = Int(dataLength)
+        
+        let payload: Data
+        if readDataLength == 0 {
+            payload = Data()
+        } else {
+            if isServer {
+                payload = pointer.unmaskData(maskStart: maskStart, offset: offset, length: readDataLength)
+            } else {
+                let end = offset + readDataLength
+                payload = Data(pointer[offset..<end])
+            }
+        }
+        offset += readDataLength
+
+        let frame = Frame(isFin: isFin > 0, needsDecompression: needsDecompression, isMasked: isMasked > 0, opcode: opcode, payloadLength: dataLength, payload: payload, closeCode: closeCode)
+        return .processedFrame(frame, offset)
+    }
+    
+    public func createWriteFrame(opcode: FrameOpCode, payload: Data, isCompressed: Bool) -> Data {
+        let payloadLength = payload.count
+        
+        let capacity = payloadLength + MaxFrameSize
+        var pointer = [UInt8](repeating: 0, count: capacity)
+        
+        //set the framing info
+        pointer[0] = FinMask | opcode.rawValue
+        if isCompressed {
+             pointer[0] |= RSV1Mask
+        }
+        
+        var offset = 2 //skip pass the framing info
+        if payloadLength < 126 {
+            pointer[1] = UInt8(payloadLength)
+        } else if payloadLength <= Int(UInt16.max) {
+            pointer[1] = 126
+            writeUint16(&pointer, offset: offset, value: UInt16(payloadLength))
+            offset += MemoryLayout<UInt16>.size
+        } else {
+            pointer[1] = 127
+            writeUint64(&pointer, offset: offset, value: UInt64(payloadLength))
+            offset += MemoryLayout<UInt64>.size
+        }
+        
+        //clients are required to mask the payload data, but server don't according to the RFC
+        if !isServer {
+            pointer[1] |= MaskMask
+            
+            //write the random mask key in
+            let maskKey: UInt32 = UInt32.random(in: 0...UInt32.max)
+            
+            writeUint32(&pointer, offset: offset, value: maskKey)
+            let maskStart = offset
+            offset += MemoryLayout<UInt32>.size
+            
+            //now write the payload data in
+            for i in 0..<payloadLength {
+                pointer[offset] = payload[i] ^ pointer[maskStart + (i % MemoryLayout<UInt32>.size)]
+                offset += 1
+            }
+        } else {
+            for i in 0..<payloadLength {
+                pointer[offset] = payload[i]
+                offset += 1
+            }
+        }
+        return Data(pointer[0..<offset])
+    }
+}
+
+/// MARK: - functions for simpler array buffer reading and writing
+
+public protocol MyWSArrayType {}
+extension UInt8: MyWSArrayType {}
+
+public extension Array where Element: MyWSArrayType & UnsignedInteger {
+    
+    /**
+     Read a UInt16 from a buffer.
+     - parameter offset: is the offset index to start the read from (e.g. buffer[0], buffer[1], etc).
+     - returns: a UInt16 of the value from the buffer
+     */
+    func readUint16(offset: Int) -> UInt16 {
+        return (UInt16(self[offset + 0]) << 8) | UInt16(self[offset + 1])
+    }
+    
+    /**
+     Read a UInt64 from a buffer.
+     - parameter offset: is the offset index to start the read from (e.g. buffer[0], buffer[1], etc).
+     - returns: a UInt64 of the value from the buffer
+     */
+    func readUint64(offset: Int) -> UInt64 {
+        var value = UInt64(0)
+        for i in 0...7 {
+            value = (value << 8) | UInt64(self[offset + i])
+        }
+        return value
+    }
+    
+    func unmaskData(maskStart: Int, offset: Int, length: Int) -> Data {
+        var unmaskedBytes = [UInt8](repeating: 0, count: length)
+        let maskSize = MemoryLayout<UInt32>.size
+        for i in 0..<length {
+            unmaskedBytes[i] = UInt8(self[offset + i] ^ self[maskStart + (i % maskSize)])
+        }
+        return Data(unmaskedBytes)
+    }
+}
+
+/**
+ Write a UInt16 to the buffer. It fills the 2 array "slots" of the UInt8 array.
+ - parameter buffer: is the UInt8 array (pointer) to write the value too.
+ - parameter offset: is the offset index to start the write from (e.g. buffer[0], buffer[1], etc).
+ */
+public func writeUint16( _ buffer: inout [UInt8], offset: Int, value: UInt16) {
+    buffer[offset + 0] = UInt8(value >> 8)
+    buffer[offset + 1] = UInt8(value & 0xff)
+}
+
+/**
+ Write a UInt32 to the buffer. It fills the 4 array "slots" of the UInt8 array.
+ - parameter buffer: is the UInt8 array (pointer) to write the value too.
+ - parameter offset: is the offset index to start the write from (e.g. buffer[0], buffer[1], etc).
+ */
+public func writeUint32( _ buffer: inout [UInt8], offset: Int, value: UInt32) {
+    for i in 0...3 {
+        buffer[offset + i] = UInt8((value >> (8*UInt32(3 - i))) & 0xff)
+    }
+}
+
+/**
+ Write a UInt64 to the buffer. It fills the 8 array "slots" of the UInt8 array.
+ - parameter buffer: is the UInt8 array (pointer) to write the value too.
+ - parameter offset: is the offset index to start the write from (e.g. buffer[0], buffer[1], etc).
+ */
+public func writeUint64( _ buffer: inout [UInt8], offset: Int, value: UInt64) {
+    for i in 0...7 {
+        buffer[offset + i] = UInt8((value >> (8*UInt64(7 - i))) & 0xff)
+    }
+}
@@ -0,0 +1,148 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  HTTPHandler.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/24/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public enum HTTPUpgradeError: Error {
+    case notAnUpgrade(Int)
+    case invalidData
+}
+
+public struct HTTPWSHeader {
+    static let upgradeName        = "Upgrade"
+    static let upgradeValue       = "websocket"
+    static let hostName           = "Host"
+    static let connectionName     = "Connection"
+    static let connectionValue    = "Upgrade"
+    static let protocolName       = "Sec-WebSocket-Protocol"
+    static let versionName        = "Sec-WebSocket-Version"
+    static let versionValue       = "13"
+    static let extensionName      = "Sec-WebSocket-Extensions"
+    static let keyName            = "Sec-WebSocket-Key"
+    static let originName         = "Origin"
+    static let acceptName         = "Sec-WebSocket-Accept"
+    static let switchProtocolCode = 101
+    static let defaultSSLSchemes  = ["wss", "https"]
+    
+    /// Creates a new URLRequest based off the source URLRequest.
+    /// - Parameter request: the request to "upgrade" the WebSocket request by adding headers.
+    /// - Parameter supportsCompression: set if the client support text compression.
+    /// - Parameter secKeyName: the security key to use in the WebSocket request. https://tools.ietf.org/html/rfc6455#section-1.3
+    /// - returns: A URLRequest request to be converted to data and sent to the server.
+    public static func createUpgrade(request: URLRequest, supportsCompression: Bool, secKeyValue: String) -> URLRequest {
+        guard let url = request.url, let parts = url.getParts() else {
+            return request
+        }
+        
+        var req = request
+        if request.value(forHTTPHeaderField: HTTPWSHeader.originName) == nil {
+            var origin = url.absoluteString
+            if let hostUrl = URL (string: "/", relativeTo: url) {
+                origin = hostUrl.absoluteString
+                origin.remove(at: origin.index(before: origin.endIndex))
+            }
+            req.setValue(origin, forHTTPHeaderField: HTTPWSHeader.originName)
+        }
+        req.setValue(HTTPWSHeader.upgradeValue, forHTTPHeaderField: HTTPWSHeader.upgradeName)
+        req.setValue(HTTPWSHeader.connectionValue, forHTTPHeaderField: HTTPWSHeader.connectionName)
+        req.setValue(HTTPWSHeader.versionValue, forHTTPHeaderField: HTTPWSHeader.versionName)
+        req.setValue(secKeyValue, forHTTPHeaderField: HTTPWSHeader.keyName)
+        
+        if let cookies = HTTPCookieStorage.shared.cookies(for: url), !cookies.isEmpty {
+            let headers = HTTPCookie.requestHeaderFields(with: cookies)
+            for (key, val) in headers {
+                req.setValue(key, forHTTPHeaderField: val)
+            }
+        }
+        
+        if supportsCompression {
+            let val = "permessage-deflate; client_max_window_bits; server_max_window_bits=15"
+            req.setValue(val, forHTTPHeaderField: HTTPWSHeader.extensionName)
+        }
+        let hostValue = req.allHTTPHeaderFields?[HTTPWSHeader.hostName] ?? "\(parts.host):\(parts.port)"
+        req.setValue(hostValue, forHTTPHeaderField: HTTPWSHeader.hostName)
+        return req
+    }
+    
+    // generateWebSocketKey 16 random characters between a-z and return them as a base64 string
+    public static func generateWebSocketKey() -> String {
+        return Data((0..<16).map{ _ in UInt8.random(in: 97...122) }).base64EncodedString()
+    }
+}
+
+public enum HTTPEvent {
+    case success([String: String])
+    case failure(Error)
+}
+
+public protocol HTTPHandlerDelegate: class {
+    func didReceiveHTTP(event: HTTPEvent)
+}
+
+public protocol HTTPHandler {
+    func register(delegate: HTTPHandlerDelegate)
+    func convert(request: URLRequest) -> Data
+    func parse(data: Data) -> Int
+}
+
+public protocol HTTPServerDelegate: class {
+    func didReceive(event: HTTPEvent)
+}
+
+public protocol HTTPServerHandler {
+    func register(delegate: HTTPServerDelegate)
+    func parse(data: Data)
+    func createResponse(headers: [String: String]) -> Data
+}
+
+public struct URLParts {
+    let port: Int
+    let host: String
+    let isTLS: Bool
+}
+
+public extension URL {
+    /// isTLSScheme returns true if the scheme is https or wss
+    var isTLSScheme: Bool {
+        guard let scheme = self.scheme else {
+            return false
+        }
+        return HTTPWSHeader.defaultSSLSchemes.contains(scheme)
+    }
+    
+    /// getParts pulls host and port from the url.
+    func getParts() -> URLParts? {
+        guard let host = self.host else {
+            return nil // no host, this isn't a valid url
+        }
+        let isTLS = isTLSScheme
+        var port = self.port ?? 0
+        if self.port == nil {
+            if isTLS {
+                port = 443
+            } else {
+                port = 80
+            }
+        }
+        return URLParts(port: port, host: host, isTLS: isTLS)
+    }
+}
@@ -0,0 +1,143 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  StringHTTPHandler.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 8/25/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public class StringHTTPHandler: HTTPHandler {
+    
+    var buffer = Data()
+    weak var delegate: HTTPHandlerDelegate?
+    
+    public init() {
+        
+    }
+    
+    public func convert(request: URLRequest) -> Data {
+        guard let url = request.url else {
+            return Data()
+        }
+        
+        var path = url.absoluteString
+        let offset = (url.scheme?.count ?? 2) + 3
+        path = String(path[path.index(path.startIndex, offsetBy: offset)..<path.endIndex])
+        if let range = path.range(of: "/") {
+            path = String(path[range.lowerBound..<path.endIndex])
+        } else {
+            path = "/"
+            if let query = url.query {
+                path += "?" + query
+            }
+        }
+        
+        var httpBody = "\(request.httpMethod ?? "GET") \(path) HTTP/1.1\r\n"
+        if let headers = request.allHTTPHeaderFields {
+            for (key, val) in headers {
+                httpBody += "\(key): \(val)\r\n"
+            }
+        }
+        httpBody += "\r\n"
+        
+        guard var data = httpBody.data(using: .utf8) else {
+            return Data()
+        }
+        
+        if let body = request.httpBody {
+            data.append(body)
+        }
+        
+        return data
+    }
+    
+    public func parse(data: Data) -> Int {
+        let offset = findEndOfHTTP(data: data)
+        if offset > 0 {
+            buffer.append(data.subdata(in: 0..<offset))
+            if parseContent(data: buffer) {
+                buffer = Data()
+            }
+        } else {
+            buffer.append(data)
+        }
+        return offset
+    }
+    
+    //returns true when the buffer should be cleared
+    func parseContent(data: Data) -> Bool {
+        guard let str = String(data: data, encoding: .utf8) else {
+            delegate?.didReceiveHTTP(event: .failure(HTTPUpgradeError.invalidData))
+            return true
+        }
+        let splitArr = str.components(separatedBy: "\r\n")
+        var code = -1
+        var i = 0
+        var headers = [String: String]()
+        for str in splitArr {
+            if i == 0 {
+                let responseSplit = str.components(separatedBy: .whitespaces)
+                guard responseSplit.count > 1 else {
+                    delegate?.didReceiveHTTP(event: .failure(HTTPUpgradeError.invalidData))
+                    return true
+                }
+                if let c = Int(responseSplit[1]) {
+                    code = c
+                }
+            } else {
+                guard let separatorIndex = str.firstIndex(of: ":") else { break }
+                let key = str.prefix(upTo: separatorIndex).trimmingCharacters(in: .whitespaces)
+                let val = str.suffix(from: str.index(after: separatorIndex)).trimmingCharacters(in: .whitespaces)
+                headers[key.lowercased()] = val
+            }
+            i += 1
+        }
+        
+        if code != HTTPWSHeader.switchProtocolCode {
+            delegate?.didReceiveHTTP(event: .failure(HTTPUpgradeError.notAnUpgrade(code)))
+            return true
+        }
+        
+        delegate?.didReceiveHTTP(event: .success(headers))
+        return true
+    }
+    
+    public func register(delegate: HTTPHandlerDelegate) {
+        self.delegate = delegate
+    }
+    
+    private func findEndOfHTTP(data: Data) -> Int {
+        let endBytes = [UInt8(ascii: "\r"), UInt8(ascii: "\n"), UInt8(ascii: "\r"), UInt8(ascii: "\n")]
+        var pointer = [UInt8]()
+        data.withUnsafeBytes { pointer.append(contentsOf: $0) }
+        var k = 0
+        for i in 0..<data.count {
+            if pointer[i] == endBytes[k] {
+                k += 1
+                if k == 4 {
+                    return i + 1
+                }
+            } else {
+                k = 0
+            }
+        }
+        return -1
+    }
+}
+
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.5</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -0,0 +1,101 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  FoundationSecurity.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 3/16/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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 CommonCrypto
+
+public enum FoundationSecurityError: Error {
+    case invalidRequest
+}
+
+public class FoundationSecurity  {
+    var allowSelfSigned = false
+    
+    public init(allowSelfSigned: Bool = false) {
+        self.allowSelfSigned = allowSelfSigned
+    }
+    
+    
+}
+
+extension FoundationSecurity: CertificatePinning {
+    public func evaluateTrust(trust: SecTrust, domain: String?, completion: ((PinningState) -> ())) {
+        if allowSelfSigned {
+            completion(.success)
+            return
+        }
+        
+        if let validateDomain = domain {
+            SecTrustSetPolicies(trust, SecPolicyCreateSSL(true, validateDomain as NSString?))
+        }
+        
+        handleSecurityTrust(trust: trust, completion: completion)
+    }
+    
+    private func handleSecurityTrust(trust: SecTrust, completion: ((PinningState) -> ())) {
+        if #available(iOS 12.0, OSX 10.14, watchOS 5.0, tvOS 12.0, *) {
+            var error: CFError?
+            if SecTrustEvaluateWithError(trust, &error) {
+                completion(.success)
+            } else {
+                completion(.failed(error))
+            }
+        } else {
+            handleOldSecurityTrust(trust: trust, completion: completion)
+        }
+    }
+    
+    private func handleOldSecurityTrust(trust: SecTrust, completion: ((PinningState) -> ())) {
+        var result: SecTrustResultType = .unspecified
+        SecTrustEvaluate(trust, &result)
+        if result == .unspecified || result == .proceed {
+            completion(.success)
+        } else {
+            let e = CFErrorCreate(kCFAllocatorDefault, "FoundationSecurityError" as NSString?, Int(result.rawValue), nil)
+            completion(.failed(e))
+        }
+    }
+}
+
+extension FoundationSecurity: HeaderValidator {
+    public func validate(headers: [String: String], key: String) -> Error? {
+        if let acceptKey = headers[HTTPWSHeader.acceptName] {
+            let sha = "\(key)258EAFA5-E914-47DA-95CA-C5AB0DC85B11".sha1Base64()
+            if sha != acceptKey {
+                return WSError(type: .securityError, message: "accept header doesn't match", code: SecurityErrorCode.acceptFailed.rawValue)
+            }
+        }
+        return nil
+    }
+}
+
+private extension String {
+    func sha1Base64() -> String {
+        let data = self.data(using: .utf8)!
+        let pointer = data.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) -> [UInt8] in
+            var digest = [UInt8](repeating: 0, count:Int(CC_SHA1_DIGEST_LENGTH))
+            CC_SHA1(bytes.baseAddress, CC_LONG(data.count), &digest)
+            return digest
+        }
+        return Data(pointer).base64EncodedString()
+    }
+}
@@ -0,0 +1,45 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Security.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 3/16/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public enum SecurityErrorCode: UInt16 {
+    case acceptFailed = 1
+    case pinningFailed = 2
+}
+
+public enum PinningState {
+    case success
+    case failed(CFError?)
+}
+
+// CertificatePinning protocol provides an interface for Transports to handle Certificate
+// or Public Key Pinning.
+public protocol CertificatePinning: class {
+    func evaluateTrust(trust: SecTrust, domain: String?, completion: ((PinningState) -> ()))
+}
+
+// validates the "Sec-WebSocket-Accept" header as defined 1.3 of the RFC 6455
+// https://tools.ietf.org/html/rfc6455#section-1.3
+public protocol HeaderValidator: class {
+    func validate(headers: [String: String], key: String) -> Error?
+}
@@ -0,0 +1,56 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Server.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 4/2/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public enum ConnectionEvent {
+    case connected([String: String])
+    case disconnected(String, UInt16)
+    case text(String)
+    case binary(Data)
+    case pong(Data?)
+    case ping(Data?)
+    case error(Error)
+}
+
+public protocol Connection {
+    func write(data: Data, opcode: FrameOpCode)
+}
+
+public protocol ConnectionDelegate: class {
+    func didReceive(event: ServerEvent)
+}
+
+public enum ServerEvent {
+    case connected(Connection, [String: String])
+    case disconnected(Connection, String, UInt16)
+    case text(Connection, String)
+    case binary(Connection, Data)
+    case pong(Connection, Data?)
+    case ping(Connection, Data?)
+}
+
+public protocol Server {
+    func start(address: String, port: UInt16) -> Error?
+}
+
+
@@ -0,0 +1,196 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  WebSocketServer.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 4/5/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if canImport(Network)
+import Foundation
+import Network
+
+/// WebSocketServer is a Network.framework implementation of a WebSocket server
+@available(watchOS, unavailable)
+@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
+public class WebSocketServer: Server, ConnectionDelegate {
+    public var onEvent: ((ServerEvent) -> Void)?
+    private var connections = [String: ServerConnection]()
+    private var listener: NWListener?
+    private let queue = DispatchQueue(label: "com.vluxe.starscream.server.networkstream", attributes: [])
+    
+    public init() {
+        
+    }
+    
+    public func start(address: String, port: UInt16) -> Error? {
+        //TODO: support TLS cert adding/binding
+        let parameters = NWParameters(tls: nil, tcp: NWProtocolTCP.Options())
+        let p = NWEndpoint.Port(rawValue: port)!
+        parameters.requiredLocalEndpoint = NWEndpoint.hostPort(host: NWEndpoint.Host.name(address, nil), port: p)
+        
+        guard let listener = try? NWListener(using: parameters, on: p) else {
+            return WSError(type: .serverError, message: "unable to start the listener at: \(address):\(port)", code: 0)
+        }
+        listener.newConnectionHandler = {[weak self] conn in
+            let transport = TCPTransport(connection: conn)
+            let c = ServerConnection(transport: transport)
+            c.delegate = self
+            self?.connections[c.uuid] = c
+        }
+//        listener.stateUpdateHandler = { state in
+//            switch state {
+//            case .ready:
+//                print("ready to get sockets!")
+//            case .setup:
+//                print("setup to get sockets!")
+//            case .cancelled:
+//                print("server cancelled!")
+//            case .waiting(let error):
+//                print("waiting error: \(error)")
+//            case .failed(let error):
+//                print("server failed: \(error)")
+//            @unknown default:
+//                print("wat?")
+//            }
+//        }
+        self.listener = listener
+        listener.start(queue: queue)
+        return nil
+    }
+    
+    public func didReceive(event: ServerEvent) {
+        onEvent?(event)
+        switch event {
+        case .disconnected(let conn, _, _):
+            guard let conn = conn as? ServerConnection else {
+                return
+            }
+            connections.removeValue(forKey: conn.uuid)
+        default:
+            break
+        }
+    }
+}
+
+@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
+public class ServerConnection: Connection, HTTPServerDelegate, FramerEventClient, FrameCollectorDelegate, TransportEventClient {
+    let transport: TCPTransport
+    private let httpHandler = FoundationHTTPServerHandler()
+    private let framer = WSFramer(isServer: true)
+    private let frameHandler = FrameCollector()
+    private var didUpgrade = false
+    public var onEvent: ((ConnectionEvent) -> Void)?
+    public weak var delegate: ConnectionDelegate?
+    private let id: String
+    var uuid: String {
+        return id
+    }
+    
+    init(transport: TCPTransport) {
+        self.id = UUID().uuidString
+        self.transport = transport
+        transport.register(delegate: self)
+        httpHandler.register(delegate: self)
+        framer.register(delegate: self)
+        frameHandler.delegate = self
+    }
+    
+    public func write(data: Data, opcode: FrameOpCode) {
+        let wsData = framer.createWriteFrame(opcode: opcode, payload: data, isCompressed: false)
+        transport.write(data: wsData, completion: {_ in })
+    }
+    
+    // MARK: - TransportEventClient
+    
+    public func connectionChanged(state: ConnectionState) {
+        switch state {
+        case .connected:
+            break
+        case .waiting:
+            break
+        case .failed(let error):
+            print("server connection error: \(error ?? WSError(type: .protocolError, message: "default error, no extra data", code: 0))") //handleError(error)
+        case .viability(_):
+            break
+        case .shouldReconnect(_):
+            break
+        case .receive(let data):
+            if didUpgrade {
+                framer.add(data: data)
+            } else {
+                httpHandler.parse(data: data)
+            }
+        case .cancelled:
+            print("server connection cancelled!")
+            //broadcast(event: .cancelled)
+        }
+    }
+    
+    /// MARK: - HTTPServerDelegate
+    
+    public func didReceive(event: HTTPEvent) {
+        switch event {
+        case .success(let headers):
+            didUpgrade = true
+            let response = httpHandler.createResponse(headers: [:])
+            transport.write(data: response, completion: {_ in })
+            delegate?.didReceive(event: .connected(self, headers))
+            onEvent?(.connected(headers))
+        case .failure(let error):
+            onEvent?(.error(error))
+        }
+    }
+    
+    /// MARK: - FrameCollectorDelegate
+    
+    public func frameProcessed(event: FrameEvent) {
+        switch event {
+        case .frame(let frame):
+            frameHandler.add(frame: frame)
+        case .error(let error):
+            onEvent?(.error(error))
+        }
+    }
+    
+    public func didForm(event: FrameCollector.Event) {
+        switch event {
+        case .text(let string):
+            delegate?.didReceive(event: .text(self, string))
+            onEvent?(.text(string))
+        case .binary(let data):
+            delegate?.didReceive(event: .binary(self, data))
+            onEvent?(.binary(data))
+        case .pong(let data):
+            delegate?.didReceive(event: .pong(self, data))
+            onEvent?(.pong(data))
+        case .ping(let data):
+            delegate?.didReceive(event: .ping(self, data))
+            onEvent?(.ping(data))
+        case .closed(let reason, let code):
+            delegate?.didReceive(event: .disconnected(self, reason, code))
+            onEvent?(.disconnected(reason, code))
+        case .error(let error):
+            onEvent?(.error(error))
+        }
+    }
+    
+    public func decompress(data: Data, isFinal: Bool) -> Data? {
+        return nil
+    }
+}
+#endif
@@ -1,92 +0,0 @@
-//
-//  SSLClientCertificate.swift
-//  Starscream
-//
-//  Created by Tomasz Trela on 08/03/2018.
-//  Copyright © 2018 Vluxe. All rights reserved.
-//
-
-import Foundation
-
-public struct SSLClientCertificateError: LocalizedError {
-    public var errorDescription: String?
-    
-    init(errorDescription: String) {
-        self.errorDescription = errorDescription
-    }
-}
-
-public class SSLClientCertificate {
-    internal let streamSSLCertificates: NSArray
-
-    /**
-     Convenience init.
-     - parameter pkcs12Path: Path to pkcs12 file containing private key and X.509 ceritifacte (.p12)
-     - parameter password: file password, see **kSecImportExportPassphrase**
-     */
-    public convenience init(pkcs12Path: String, password: String) throws {
-        let pkcs12Url = URL(fileURLWithPath: pkcs12Path)
-        do {
-            try self.init(pkcs12Url: pkcs12Url, password: password)
-        } catch {
-            throw error
-        }
-    }
-    
-    /**
-     Designated init. For more information, see SSLSetCertificate() in Security/SecureTransport.h.
-     - parameter identity: SecIdentityRef, see **kCFStreamSSLCertificates**
-     - parameter identityCertificate: CFArray of SecCertificateRefs, see **kCFStreamSSLCertificates**
-     */
-    public init(identity: SecIdentity, identityCertificate: SecCertificate) {
-        self.streamSSLCertificates = NSArray(objects: identity, identityCertificate)
-    }
-    
-    /**
-     Convenience init.
-     - parameter pkcs12Url: URL to pkcs12 file containing private key and X.509 ceritifacte (.p12)
-     - parameter password: file password, see **kSecImportExportPassphrase**
-     */
-    public convenience init(pkcs12Url: URL, password: String) throws {
-        let importOptions = [kSecImportExportPassphrase as String : password] as CFDictionary
-        do {
-            try self.init(pkcs12Url: pkcs12Url, importOptions: importOptions)
-        } catch {
-            throw error
-        }
-    }
-    
-    /**
-     Designated init.
-     - parameter pkcs12Url: URL to pkcs12 file containing private key and X.509 ceritifacte (.p12)
-     - parameter importOptions: A dictionary containing import options. A
-     kSecImportExportPassphrase entry is required at minimum. Only password-based
-     PKCS12 blobs are currently supported. See **SecImportExport.h**
-     */
-    public init(pkcs12Url: URL, importOptions: CFDictionary) throws {
-        do {
-            let pkcs12Data = try Data(contentsOf: pkcs12Url)
-            var rawIdentitiesAndCertificates: CFArray?
-            let pkcs12CFData: CFData = pkcs12Data as CFData
-            let importStatus = SecPKCS12Import(pkcs12CFData, importOptions, &rawIdentitiesAndCertificates)
-            
-            guard importStatus == errSecSuccess else {
-                throw SSLClientCertificateError(errorDescription: "(Starscream) Error during 'SecPKCS12Import', see 'SecBase.h' - OSStatus: \(importStatus)")
-            }
-            guard let identitiyAndCertificate = (rawIdentitiesAndCertificates as? Array<Dictionary<String, Any>>)?.first else {
-                throw SSLClientCertificateError(errorDescription: "(Starscream) Error - PKCS12 file is empty")
-            }
-            
-            let identity = identitiyAndCertificate[kSecImportItemIdentity as String] as! SecIdentity
-            var identityCertificate: SecCertificate?
-            let copyStatus = SecIdentityCopyCertificate(identity, &identityCertificate)
-            guard copyStatus == errSecSuccess else {
-                throw SSLClientCertificateError(errorDescription: "(Starscream) Error during 'SecIdentityCopyCertificate', see 'SecBase.h' - OSStatus: \(copyStatus)")
-            }
-            self.streamSSLCertificates = NSArray(objects: identity, identityCertificate!)
-        } catch {
-            throw error
-        }
-    }
-}
-
@@ -1,266 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////
-//
-//  SSLSecurity.swift
-//  Starscream
-//
-//  Created by Dalton Cherry on 5/16/15.
-//  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.
-//
-//////////////////////////////////////////////////////////////////////////////////////////////////
-#if os(Linux)
-#else
-import Foundation
-import Security
-
-public protocol SSLTrustValidator {
-    func isValid(_ trust: SecTrust, domain: String?) -> Bool
-}
-
-open class SSLCert {
-    var certData: Data?
-    var key: SecKey?
-    
-    /**
-    Designated init for certificates
-    
-    - parameter data: is the binary data of the certificate
-    
-    - returns: a representation security object to be used with
-    */
-    public init(data: Data) {
-        self.certData = data
-    }
-    
-    /**
-    Designated init for public keys
-    
-    - parameter key: is the public key to be used
-    
-    - returns: a representation security object to be used with
-    */
-    public init(key: SecKey) {
-        self.key = key
-    }
-}
-
-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
-    var usePublicKeys = false //use public keys or certificate validation?
-    
-    /**
-    Use certs from main app bundle
-    
-    - parameter usePublicKeys: is to specific if the publicKeys or certificates should be used for SSL pinning validation
-    
-    - returns: a representation security object to be used with
-    */
-    public convenience init(usePublicKeys: Bool = false) {
-        let paths = Bundle.main.paths(forResourcesOfType: "cer", inDirectory: ".")
-        
-        let certs = paths.reduce([SSLCert]()) { (certs: [SSLCert], path: String) -> [SSLCert] in
-            var certs = certs
-            if let data = NSData(contentsOfFile: path) {
-                certs.append(SSLCert(data: data as Data))
-            }
-            return certs
-        }
-        
-        self.init(certs: certs, usePublicKeys: usePublicKeys)
-    }
-    
-    /**
-    Designated init
-    
-    - 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
-    */
-    public init(certs: [SSLCert], usePublicKeys: Bool) {
-        self.usePublicKeys = usePublicKeys
-        
-        if self.usePublicKeys {
-            DispatchQueue.global(qos: .default).async {
-                let pubKeys = certs.reduce([SecKey]()) { (pubKeys: [SecKey], cert: SSLCert) -> [SecKey] in
-                    var pubKeys = pubKeys
-                    if let data = cert.certData, cert.key == nil {
-                        cert.key = self.extractPublicKey(data)
-                    }
-                    if let key = cert.key {
-                        pubKeys.append(key)
-                    }
-                    return pubKeys
-                }
-                
-                self.pubKeys = pubKeys
-                self.isReady = true
-            }
-        } else {
-            let certificates = certs.reduce([Data]()) { (certificates: [Data], cert: SSLCert) -> [Data] in
-                var certificates = certificates
-                if let data = cert.certData {
-                    certificates.append(data)
-                }
-                return certificates
-            }
-            self.certificates = certificates
-            self.isReady = true
-        }
-    }
-    
-    /**
-    Valid the trust and domain name.
-    
-    - parameter trust: is the serverTrust to validate
-    - parameter domain: is the CN domain to validate
-    
-    - returns: if the key was successfully validated
-    */
-    open func isValid(_ trust: SecTrust, domain: String?) -> Bool {
-        
-        var tries = 0
-        while !self.isReady {
-            usleep(1000)
-            tries += 1
-            if tries > 5 {
-                return false //doesn't appear it is going to ever be ready...
-            }
-        }
-        var policy: SecPolicy
-        if self.validatedDN {
-            policy = SecPolicyCreateSSL(true, domain as NSString?)
-        } else {
-            policy = SecPolicyCreateBasicX509()
-        }
-        SecTrustSetPolicies(trust,policy)
-        if self.usePublicKeys {
-            if let keys = self.pubKeys {
-                let serverPubKeys = publicKeyChain(trust)
-                for serverKey in serverPubKeys as [AnyObject] {
-                    for key in keys as [AnyObject] {
-                        if serverKey.isEqual(key) {
-                            return true
-                        }
-                    }
-                }
-            }
-        } else if let certs = self.certificates {
-            let serverCerts = certificateChain(trust)
-            var collect = [SecCertificate]()
-            for cert in certs {
-                collect.append(SecCertificateCreateWithData(nil,cert as CFData)!)
-            }
-            SecTrustSetAnchorCertificates(trust,collect as NSArray)
-            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 {
-                        if cert == serverCert {
-                            trustedCount += 1
-                            break
-                        }
-                    }
-                }
-                if trustedCount == serverCerts.count {
-                    return true
-                }
-            }
-        }
-        return false
-    }
-    
-    /**
-    Get the public key from a certificate data
-    
-    - parameter data: is the certificate to pull the public key from
-    
-    - returns: a public key
-    */
-    public func extractPublicKey(_ data: Data) -> SecKey? {
-        guard let cert = SecCertificateCreateWithData(nil, data as CFData) else { return nil }
-        
-        return extractPublicKey(cert, policy: SecPolicyCreateBasicX509())
-    }
-    
-    /**
-    Get the public key from a certificate
-    
-    - parameter data: is the certificate to pull the public key from
-    
-    - returns: a public key
-    */
-    public func extractPublicKey(_ cert: SecCertificate, policy: SecPolicy) -> SecKey? {
-        var possibleTrust: SecTrust?
-        SecTrustCreateWithCertificates(cert, policy, &possibleTrust)
-        
-        guard let trust = possibleTrust else { return nil }
-        var result: SecTrustResultType = .unspecified
-        SecTrustEvaluate(trust, &result)
-        return SecTrustCopyPublicKey(trust)
-    }
-    
-    /**
-    Get the certificate chain for the trust
-    
-    - parameter trust: is the trust to lookup the certificate chain for
-    
-    - returns: the certificate chain for the trust
-    */
-    public func certificateChain(_ trust: SecTrust) -> [Data] {
-        let certificates = (0..<SecTrustGetCertificateCount(trust)).reduce([Data]()) { (certificates: [Data], index: Int) -> [Data] in
-            var certificates = certificates
-            let cert = SecTrustGetCertificateAtIndex(trust, index)
-            certificates.append(SecCertificateCopyData(cert!) as Data)
-            return certificates
-        }
-        
-        return certificates
-    }
-    
-    /**
-    Get the public key chain for the trust
-    
-    - parameter trust: is the trust to lookup the certificate chain and extract the public keys
-    
-    - returns: the public keys from the certifcate chain for the trust
-    */
-    public func publicKeyChain(_ trust: SecTrust) -> [SecKey] {
-        let policy = SecPolicyCreateBasicX509()
-        let keys = (0..<SecTrustGetCertificateCount(trust)).reduce([SecKey]()) { (keys: [SecKey], index: Int) -> [SecKey] in
-            var keys = keys
-            let cert = SecTrustGetCertificateAtIndex(trust, index)
-            if let key = extractPublicKey(cert!, policy: policy) {
-                keys.append(key)
-            }
-            
-            return keys
-        }
-        
-        return keys
-    }
-    
-    
-}
-#endif
@@ -0,0 +1,213 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  FoundationTransport.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/23/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public enum FoundationTransportError: Error {
+    case invalidRequest
+    case invalidOutputStream
+    case timeout
+}
+
+public class FoundationTransport: NSObject, Transport, StreamDelegate {
+    private weak var delegate: TransportEventClient?
+    private let workQueue = DispatchQueue(label: "com.vluxe.starscream.websocket", attributes: [])
+    private var inputStream: InputStream?
+    private var outputStream: OutputStream?
+    private var isOpen = false
+    private var onConnect: ((InputStream, OutputStream) -> Void)?
+    private var isTLS = false
+    private var certPinner: CertificatePinning?
+    
+    public var usingTLS: Bool {
+        return self.isTLS
+    }
+    
+    public init(streamConfiguration: ((InputStream, OutputStream) -> Void)? = nil) {
+        super.init()
+        onConnect = streamConfiguration
+    }
+    
+     public func connect(url: URL, timeout: Double = 10, certificatePinning: CertificatePinning? = nil) {
+        guard let parts = url.getParts() else {
+            delegate?.connectionChanged(state: .failed(FoundationTransportError.invalidRequest))
+            return
+        }
+        self.certPinner = certificatePinning
+        self.isTLS = parts.isTLS
+        var readStream: Unmanaged<CFReadStream>?
+        var writeStream: Unmanaged<CFWriteStream>?
+        let h = parts.host as NSString
+        CFStreamCreatePairWithSocketToHost(nil, h, UInt32(parts.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 isTLS {
+            let key = CFStreamPropertyKey(rawValue: kCFStreamPropertySocketSecurityLevel)
+            CFReadStreamSetProperty(inStream, key, kCFStreamSocketSecurityLevelNegotiatedSSL)
+            CFWriteStreamSetProperty(outStream, key, kCFStreamSocketSecurityLevelNegotiatedSSL)
+        }
+        
+        onConnect?(inStream, outStream)
+        
+        isOpen = false
+        CFReadStreamSetDispatchQueue(inStream, workQueue)
+        CFWriteStreamSetDispatchQueue(outStream, workQueue)
+        inStream.open()
+        outStream.open()
+        
+        
+        workQueue.asyncAfter(deadline: .now() + timeout, execute: { [weak self] in
+            guard let s = self else { return }
+            if !s.isOpen {
+                s.delegate?.connectionChanged(state: .failed(FoundationTransportError.timeout))
+            }
+        })
+    }
+    
+    public func disconnect() {
+        if let stream = inputStream {
+            stream.delegate = nil
+            CFReadStreamSetDispatchQueue(stream, nil)
+            stream.close()
+        }
+        if let stream = outputStream {
+            stream.delegate = nil
+            CFWriteStreamSetDispatchQueue(stream, nil)
+            stream.close()
+        }
+        isOpen = false
+        outputStream = nil
+        inputStream = nil
+    }
+    
+    public func register(delegate: TransportEventClient) {
+        self.delegate = delegate
+    }
+    
+    public func write(data: Data, completion: @escaping ((Error?) -> ())) {
+        guard let outStream = outputStream else {
+            completion(FoundationTransportError.invalidOutputStream)
+            return
+        }
+        var total = 0
+        let buffer = UnsafeRawPointer((data as NSData).bytes).assumingMemoryBound(to: UInt8.self)
+        //NOTE: this might need to be dispatched to the work queue instead of being written inline. TBD.
+        while total < data.count {
+            let written = outStream.write(buffer, maxLength: data.count)
+            if written < 0 {
+                completion(FoundationTransportError.invalidOutputStream)
+                return
+            }
+            total += written
+        }
+        completion(nil)
+    }
+    
+    private func getSecurityData() -> (SecTrust?, String?) {
+        #if os(watchOS)
+        return (nil, nil)
+        #else
+        guard let outputStream = outputStream else {
+            return (nil, nil)
+        }
+        let trust = outputStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) as! SecTrust?
+        var domain = outputStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as! String?
+        
+        if domain == nil,
+            let sslContextOut = CFWriteStreamCopyProperty(outputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext? {
+            var peerNameLen: Int = 0
+            SSLGetPeerDomainNameLength(sslContextOut, &peerNameLen)
+            var peerName = Data(count: peerNameLen)
+            let _ = peerName.withUnsafeMutableBytes { (peerNamePtr: UnsafeMutablePointer<Int8>) in
+                SSLGetPeerDomainName(sslContextOut, peerNamePtr, &peerNameLen)
+            }
+            if let peerDomain = String(bytes: peerName, encoding: .utf8), peerDomain.count > 0 {
+                domain = peerDomain
+            }
+        }
+        return (trust, domain)
+        #endif
+    }
+    
+    private func read() {
+        guard let stream = inputStream else {
+            return
+        }
+        let maxBuffer = 4096
+        let buf = NSMutableData(capacity: maxBuffer)
+        let buffer = UnsafeMutableRawPointer(mutating: buf!.bytes).assumingMemoryBound(to: UInt8.self)
+        let length = stream.read(buffer, maxLength: maxBuffer)
+        if length < 1 {
+            return
+        }
+        let data = Data(bytes: buffer, count: length)
+        delegate?.connectionChanged(state: .receive(data))
+    }
+    
+    // MARK: - StreamDelegate
+    
+    open func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
+        switch eventCode {
+        case .hasBytesAvailable:
+            if aStream == inputStream {
+                read()
+            }
+        case .errorOccurred:
+            delegate?.connectionChanged(state: .failed(aStream.streamError))
+        case .endEncountered:
+            if aStream == inputStream {
+                delegate?.connectionChanged(state: .cancelled)
+            }
+        case .openCompleted:
+            if aStream == inputStream {
+                let (trust, domain) = getSecurityData()
+                if let pinner = certPinner, let trust = trust {
+                    pinner.evaluateTrust(trust: trust, domain:  domain, completion: { [weak self] (state) in
+                        switch state {
+                        case .success:
+                            self?.isOpen = true
+                            self?.delegate?.connectionChanged(state: .connected)
+                        case .failed(let error):
+                            self?.delegate?.connectionChanged(state: .failed(error))
+                        }
+                        
+                    })
+                } else {
+                    isOpen = true
+                    delegate?.connectionChanged(state: .connected)
+                }
+            }
+        case .endEncountered:
+            if aStream == inputStream {
+                delegate?.connectionChanged(state: .cancelled)
+            }
+        default:
+            break
+        }
+    }
+}
@@ -0,0 +1,150 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  HTTPTransport.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/23/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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.
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if canImport(Network)
+import Foundation
+import Network
+
+public enum TCPTransportError: Error {
+    case invalidRequest
+}
+
+@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *)
+public class TCPTransport: Transport {
+    private var connection: NWConnection?
+    private let queue = DispatchQueue(label: "com.vluxe.starscream.networkstream", attributes: [])
+    private weak var delegate: TransportEventClient?
+    private var isRunning = false
+    private var isTLS = false
+    
+    public var usingTLS: Bool {
+        return self.isTLS
+    }
+    
+    public init(connection: NWConnection) {
+        self.connection = connection
+        start()
+    }
+    
+    public init() {
+        //normal connection, will use the "connect" method below
+    }
+    
+    public func connect(url: URL, timeout: Double = 10, certificatePinning: CertificatePinning? = nil) {
+        guard let parts = url.getParts() else {
+            delegate?.connectionChanged(state: .failed(TCPTransportError.invalidRequest))
+            return
+        }
+        self.isTLS = parts.isTLS
+        let options = NWProtocolTCP.Options()
+        options.connectionTimeout = Int(timeout.rounded(.up))
+
+        let tlsOptions = isTLS ? NWProtocolTLS.Options() : nil
+        if let tlsOpts = tlsOptions {
+            sec_protocol_options_set_verify_block(tlsOpts.securityProtocolOptions, { (sec_protocol_metadata, sec_trust, sec_protocol_verify_complete) in
+                let trust = sec_trust_copy_ref(sec_trust).takeRetainedValue()
+                guard let pinner = certificatePinning else {
+                    sec_protocol_verify_complete(true)
+                    return
+                }
+                pinner.evaluateTrust(trust: trust, domain: parts.host, completion: { (state) in
+                    switch state {
+                    case .success:
+                        sec_protocol_verify_complete(true)
+                    case .failed(_):
+                        sec_protocol_verify_complete(false)
+                    }
+                })
+            }, queue)
+        }
+        let parameters = NWParameters(tls: tlsOptions, tcp: options)
+        let conn = NWConnection(host: NWEndpoint.Host.name(parts.host, nil), port: NWEndpoint.Port(rawValue: UInt16(parts.port))!, using: parameters)
+        connection = conn
+        start()
+    }
+    
+    public func disconnect() {
+        isRunning = false
+        connection?.cancel()
+    }
+    
+    public func register(delegate: TransportEventClient) {
+        self.delegate = delegate
+    }
+    
+    public func write(data: Data, completion: @escaping ((Error?) -> ())) {
+        connection?.send(content: data, completion: .contentProcessed { (error) in
+            completion(error)
+        })
+    }
+    
+    private func start() {
+        guard let conn = connection else {
+            return
+        }
+        conn.stateUpdateHandler = { [weak self] (newState) in
+            switch newState {
+            case .ready:
+                self?.delegate?.connectionChanged(state: .connected)
+            case .waiting:
+                self?.delegate?.connectionChanged(state: .waiting)
+            case .cancelled:
+                self?.delegate?.connectionChanged(state: .cancelled)
+            case .failed(let error):
+                self?.delegate?.connectionChanged(state: .failed(error))
+            case .setup, .preparing:
+                break
+            @unknown default:
+                break
+            }
+        }
+        
+        conn.viabilityUpdateHandler = { [weak self] (isViable) in
+            self?.delegate?.connectionChanged(state: .viability(isViable))
+        }
+        
+        conn.betterPathUpdateHandler = { [weak self] (isBetter) in
+            self?.delegate?.connectionChanged(state: .shouldReconnect(isBetter))
+        }
+        
+        conn.start(queue: queue)
+        isRunning = true
+        readLoop()
+    }
+    
+    //readLoop keeps reading from the connection to get the latest content
+    private func readLoop() {
+        if !isRunning {
+            return
+        }
+        connection?.receive(minimumIncompleteLength: 2, maximumLength: 4096, completion: {[weak self] (data, context, isComplete, error) in
+            guard let s = self else {return}
+            if let data = data {
+                s.delegate?.connectionChanged(state: .receive(data))
+            }
+            s.readLoop()
+        })
+    }
+}
+#else
+typealias TCPTransport = FoundationTransport
+#endif
@@ -0,0 +1,55 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Transport.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/23/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+//  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
+
+public enum ConnectionState {
+    case connected
+    case waiting
+    case cancelled
+    case failed(Error?)
+    
+    //the viability (connection status) of the connection has updated
+    //e.g. connection is down, connection came back up, etc
+    case viability(Bool)
+    
+    //the connection has upgrade to wifi from cellular.
+    //you should consider reconnecting to take advantage of this
+    case shouldReconnect(Bool)
+    
+    //the connection receive data
+    case receive(Data)
+}
+
+public protocol TransportEventClient: class {
+    func connectionChanged(state: ConnectionState)
+}
+
+public protocol Transport: class {
+    func register(delegate: TransportEventClient)
+    func connect(url: URL, timeout: Double, certificatePinning: CertificatePinning?)
+    func disconnect()
+    func write(data: Data, completion: @escaping ((Error?) -> ()))
+    var usingTLS: Bool { get }
+}
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "Starscream"
-  s.version      = "3.0.6"
+  s.version      = "4.0.2"
  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'
@@ -12,5 +12,5 @@ Pod::Spec.new do |s|
  s.tvos.deployment_target = '9.0'
  s.watchos.deployment_target = '2.0'
  s.source_files = 'Sources/**/*.swift'
-  s.swift_version = '4.2'
+  s.swift_version = '5.0'
 end
@@ -12,14 +12,30 @@
 		335FA1FC1F5DF71D00F6D2EC /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D88EAF811ED4DFD3004FE2C3 /* libz.tbd */; };
 		33CCF08A1F5DDC030099B092 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D88EAF811ED4DFD3004FE2C3 /* libz.tbd */; };
 		33CCF08C1F5DDC030099B092 /* Starscream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1360001C473BEF00AA3A01 /* Starscream.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BBB5ABE5215E2217005B48B6 /* Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE1215E2217005B48B6 /* Compression.swift */; };
-		BBB5ABE6215E2217005B48B6 /* SSLClientCertificate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */; };
-		BBB5ABE7215E2217005B48B6 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */; };
+		5C23C24521FBB0EE00D315F1 /* FoundationHTTPHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C23C24421FBB0EE00D315F1 /* FoundationHTTPHandler.swift */; };
+		5C7CB5A722B59ABA006AF81B /* NativeEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7CB5A622B59ABA006AF81B /* NativeEngine.swift */; };
+		5C7CB5A922B5A14C006AF81B /* Engine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7CB5A822B5A14C006AF81B /* Engine.swift */; };
+		5C7CB5AB22B5ABF0006AF81B /* WSEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7CB5AA22B5ABF0006AF81B /* WSEngine.swift */; };
+		5C839729231359AE00856501 /* StringHTTPHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C839728231359AE00856501 /* StringHTTPHandler.swift */; };
+		5C85661D2257AE9D00A371DD /* WebSocketServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C85661C2257AE9D00A371DD /* WebSocketServer.swift */; };
+		5CF1D064225055760081C8A8 /* Data+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ABD446F224C036A00FB8370 /* Data+Extensions.swift */; };
+		5CF1D0662253DD490081C8A8 /* FoundationHTTPServerHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF1D0652253DD490081C8A8 /* FoundationHTTPServerHandler.swift */; };
+		5CF1D0682253DD940081C8A8 /* Server.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF1D0672253DD940081C8A8 /* Server.swift */; };
+		8A1681A7223D8664000C08D8 /* Security.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1681A6223D8664000C08D8 /* Security.swift */; };
+		8A1681A9223D8707000C08D8 /* FoundationSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1681A8223D8707000C08D8 /* FoundationSecurity.swift */; };
+		8A7A718821F8E1490061166D /* Transport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A718721F8E1490061166D /* Transport.swift */; };
+		8A7A718A21F8E23C0061166D /* TCPTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A718921F8E23C0061166D /* TCPTransport.swift */; };
+		8A7A718C21F8F9790061166D /* FoundationTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A718B21F8F9790061166D /* FoundationTransport.swift */; };
+		8A7A718F21F924D40061166D /* Framer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A718E21F924D40061166D /* Framer.swift */; };
+		8A7A719121FA3DCD0061166D /* FrameCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A719021FA3DCD0061166D /* FrameCollector.swift */; };
+		8A7A719321FA42BA0061166D /* HTTPHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A719221FA42BA0061166D /* HTTPHandler.swift */; };
+		8A7A719621FFB3190061166D /* FuzzingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A719421FFB2E30061166D /* FuzzingTests.swift */; };
+		8A7A719921FFB4650061166D /* MockTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A719721FFB4280061166D /* MockTransport.swift */; };
+		8A7A719C220248330061166D /* MockServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A719A2200C6DE0061166D /* MockServer.swift */; };
+		8A906E3D2208BD9B0015057D /* Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A906E3C2208BD9B0015057D /* Compression.swift */; };
+		8A906E3F2208C7E80015057D /* WSCompression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A906E3E2208C7E80015057D /* WSCompression.swift */; };
+		8ABD4470224C036A00FB8370 /* Data+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ABD446F224C036A00FB8370 /* Data+Extensions.swift */; };
 		BBB5ABE8215E2217005B48B6 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE4215E2217005B48B6 /* WebSocket.swift */; };
-		BBB5ABE9215E221D005B48B6 /* Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE1215E2217005B48B6 /* Compression.swift */; };
-		BBB5ABEA215E221D005B48B6 /* SSLClientCertificate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */; };
-		BBB5ABEB215E221D005B48B6 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */; };
-		BBB5ABEC215E221D005B48B6 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE4215E2217005B48B6 /* WebSocket.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
@@ -27,11 +43,30 @@
 		33CCF0921F5DDC030099B092 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C1360001C473BEF00AA3A01 /* Starscream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Starscream.h; path = Sources/Starscream.h; sourceTree = SOURCE_ROOT; };
 		5C13600C1C473BFE00AA3A01 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = SOURCE_ROOT; };
+		5C23C24421FBB0EE00D315F1 /* FoundationHTTPHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoundationHTTPHandler.swift; sourceTree = "<group>"; };
+		5C7CB5A622B59ABA006AF81B /* NativeEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeEngine.swift; sourceTree = "<group>"; };
+		5C7CB5A822B5A14C006AF81B /* Engine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Engine.swift; sourceTree = "<group>"; };
+		5C7CB5AA22B5ABF0006AF81B /* WSEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WSEngine.swift; sourceTree = "<group>"; };
+		5C839728231359AE00856501 /* StringHTTPHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringHTTPHandler.swift; sourceTree = "<group>"; };
+		5C85661C2257AE9D00A371DD /* WebSocketServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocketServer.swift; sourceTree = "<group>"; };
+		5CF1D0652253DD490081C8A8 /* FoundationHTTPServerHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoundationHTTPServerHandler.swift; sourceTree = "<group>"; };
+		5CF1D0672253DD940081C8A8 /* Server.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Server.swift; sourceTree = "<group>"; };
 		6B3E7A0019D48C2F006071F7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StarscreamTests.swift; path = StarscreamTests/StarscreamTests.swift; sourceTree = "<group>"; };
-		BBB5ABE1215E2217005B48B6 /* Compression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Compression.swift; path = Starscream/Compression.swift; sourceTree = "<group>"; };
-		BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLClientCertificate.swift; path = Starscream/SSLClientCertificate.swift; sourceTree = "<group>"; };
-		BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLSecurity.swift; path = Starscream/SSLSecurity.swift; sourceTree = "<group>"; };
+		8A1681A6223D8664000C08D8 /* Security.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Security.swift; sourceTree = "<group>"; };
+		8A1681A8223D8707000C08D8 /* FoundationSecurity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoundationSecurity.swift; sourceTree = "<group>"; };
+		8A7A718721F8E1490061166D /* Transport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Transport.swift; path = Transport/Transport.swift; sourceTree = "<group>"; };
+		8A7A718921F8E23C0061166D /* TCPTransport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TCPTransport.swift; path = Transport/TCPTransport.swift; sourceTree = "<group>"; };
+		8A7A718B21F8F9790061166D /* FoundationTransport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FoundationTransport.swift; path = Transport/FoundationTransport.swift; sourceTree = "<group>"; };
+		8A7A718E21F924D40061166D /* Framer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Framer.swift; sourceTree = "<group>"; };
+		8A7A719021FA3DCD0061166D /* FrameCollector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameCollector.swift; sourceTree = "<group>"; };
+		8A7A719221FA42BA0061166D /* HTTPHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPHandler.swift; sourceTree = "<group>"; };
+		8A7A719421FFB2E30061166D /* FuzzingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzingTests.swift; sourceTree = "<group>"; };
+		8A7A719721FFB4280061166D /* MockTransport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTransport.swift; sourceTree = "<group>"; };
+		8A7A719A2200C6DE0061166D /* MockServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockServer.swift; sourceTree = "<group>"; };
+		8A906E3C2208BD9B0015057D /* Compression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Compression.swift; path = Compression/Compression.swift; sourceTree = "<group>"; };
+		8A906E3E2208C7E80015057D /* WSCompression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WSCompression.swift; path = Compression/WSCompression.swift; sourceTree = "<group>"; };
+		8ABD446F224C036A00FB8370 /* Data+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Extensions.swift"; sourceTree = "<group>"; };
 		BBB5ABE4215E2217005B48B6 /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; name = WebSocket.swift; path = Starscream/WebSocket.swift; sourceTree = "<group>"; tabWidth = 4; };
 		D88EAF811ED4DFD3004FE2C3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		D88EAF831ED4E7D8004FE2C3 /* CompressionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompressionTests.swift; sourceTree = "<group>"; };
@@ -57,6 +92,25 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		5C7CB5A522B59A82006AF81B /* Engine */ = {
+			isa = PBXGroup;
+			children = (
+				5C7CB5A822B5A14C006AF81B /* Engine.swift */,
+				5C7CB5A622B59ABA006AF81B /* NativeEngine.swift */,
+				5C7CB5AA22B5ABF0006AF81B /* WSEngine.swift */,
+			);
+			path = Engine;
+			sourceTree = "<group>";
+		};
+		5C85661B2257AE7500A371DD /* Server */ = {
+			isa = PBXGroup;
+			children = (
+				5CF1D0672253DD940081C8A8 /* Server.swift */,
+				5C85661C2257AE9D00A371DD /* WebSocketServer.swift */,
+			);
+			path = Server;
+			sourceTree = "<group>";
+		};
 		6B3E79DC19D48B7F006071F7 = {
 			isa = PBXGroup;
 			children = (
@@ -79,10 +133,14 @@
 		6B3E79E819D48B7F006071F7 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				BBB5ABE1215E2217005B48B6 /* Compression.swift */,
-				BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */,
-				BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */,
+				8ABD446E224C033600FB8370 /* DataBytes */,
+				5C7CB5A522B59A82006AF81B /* Engine */,
+				8A7A718D21F924BF0061166D /* Framer */,
+				8A7A718621F8DB930061166D /* Transport */,
+				8A7A718521F8DB810061166D /* Compression */,
+				8A1681A5223D8648000C08D8 /* Security */,
 				BBB5ABE4215E2217005B48B6 /* WebSocket.swift */,
+				5C85661B2257AE7500A371DD /* Server */,
 				5C1360001C473BEF00AA3A01 /* Starscream.h */,
 				6B3E79E919D48B7F006071F7 /* Supporting Files */,
 			);
@@ -103,10 +161,62 @@
 				6B3E7A0019D48C2F006071F7 /* Info.plist */,
 				742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */,
 				D88EAF831ED4E7D8004FE2C3 /* CompressionTests.swift */,
+				8A7A719421FFB2E30061166D /* FuzzingTests.swift */,
+				8A7A719721FFB4280061166D /* MockTransport.swift */,
+				8A7A719A2200C6DE0061166D /* MockServer.swift */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
 		};
+		8A1681A5223D8648000C08D8 /* Security */ = {
+			isa = PBXGroup;
+			children = (
+				8A1681A6223D8664000C08D8 /* Security.swift */,
+				8A1681A8223D8707000C08D8 /* FoundationSecurity.swift */,
+			);
+			path = Security;
+			sourceTree = "<group>";
+		};
+		8A7A718521F8DB810061166D /* Compression */ = {
+			isa = PBXGroup;
+			children = (
+				8A906E3C2208BD9B0015057D /* Compression.swift */,
+				8A906E3E2208C7E80015057D /* WSCompression.swift */,
+			);
+			name = Compression;
+			sourceTree = "<group>";
+		};
+		8A7A718621F8DB930061166D /* Transport */ = {
+			isa = PBXGroup;
+			children = (
+				8A7A718721F8E1490061166D /* Transport.swift */,
+				8A7A718921F8E23C0061166D /* TCPTransport.swift */,
+				8A7A718B21F8F9790061166D /* FoundationTransport.swift */,
+			);
+			name = Transport;
+			sourceTree = "<group>";
+		};
+		8A7A718D21F924BF0061166D /* Framer */ = {
+			isa = PBXGroup;
+			children = (
+				8A7A718E21F924D40061166D /* Framer.swift */,
+				8A7A719021FA3DCD0061166D /* FrameCollector.swift */,
+				8A7A719221FA42BA0061166D /* HTTPHandler.swift */,
+				5C23C24421FBB0EE00D315F1 /* FoundationHTTPHandler.swift */,
+				5CF1D0652253DD490081C8A8 /* FoundationHTTPServerHandler.swift */,
+				5C839728231359AE00856501 /* StringHTTPHandler.swift */,
+			);
+			path = Framer;
+			sourceTree = "<group>";
+		};
+		8ABD446E224C033600FB8370 /* DataBytes */ = {
+			isa = PBXGroup;
+			children = (
+				8ABD446F224C036A00FB8370 /* Data+Extensions.swift */,
+			);
+			path = DataBytes;
+			sourceTree = "<group>";
+		};
 		D88EAF801ED4DFD3004FE2C3 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -172,7 +282,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Vluxe;
 				TargetAttributes = {
 					335FA1F41F5DF71D00F6D2EC = {
@@ -185,9 +295,10 @@
 			};
 			buildConfigurationList = 6B3E79E019D48B7F006071F7 /* Build configuration list for PBXProject "Starscream" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 6B3E79DC19D48B7F006071F7;
@@ -223,12 +334,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BBB5ABEB215E221D005B48B6 /* SSLSecurity.swift in Sources */,
-				BBB5ABEC215E221D005B48B6 /* WebSocket.swift in Sources */,
-				BBB5ABE9215E221D005B48B6 /* Compression.swift in Sources */,
+				5CF1D064225055760081C8A8 /* Data+Extensions.swift in Sources */,
+				8A7A719C220248330061166D /* MockServer.swift in Sources */,
+				8A7A719921FFB4650061166D /* MockTransport.swift in Sources */,
+				8A7A719621FFB3190061166D /* FuzzingTests.swift in Sources */,
 				335FA1F91F5DF71D00F6D2EC /* CompressionTests.swift in Sources */,
 				335FA1FA1F5DF71D00F6D2EC /* StarscreamTests.swift in Sources */,
-				BBB5ABEA215E221D005B48B6 /* SSLClientCertificate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -236,10 +347,26 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BBB5ABE5215E2217005B48B6 /* Compression.swift in Sources */,
+				8A7A719321FA42BA0061166D /* HTTPHandler.swift in Sources */,
+				8A7A719121FA3DCD0061166D /* FrameCollector.swift in Sources */,
+				8A1681A7223D8664000C08D8 /* Security.swift in Sources */,
+				8A7A718A21F8E23C0061166D /* TCPTransport.swift in Sources */,
+				8A1681A9223D8707000C08D8 /* FoundationSecurity.swift in Sources */,
+				8A7A718C21F8F9790061166D /* FoundationTransport.swift in Sources */,
 				BBB5ABE8215E2217005B48B6 /* WebSocket.swift in Sources */,
-				BBB5ABE7215E2217005B48B6 /* SSLSecurity.swift in Sources */,
-				BBB5ABE6215E2217005B48B6 /* SSLClientCertificate.swift in Sources */,
+				5C839729231359AE00856501 /* StringHTTPHandler.swift in Sources */,
+				5C7CB5A922B5A14C006AF81B /* Engine.swift in Sources */,
+				8A7A718F21F924D40061166D /* Framer.swift in Sources */,
+				5CF1D0662253DD490081C8A8 /* FoundationHTTPServerHandler.swift in Sources */,
+				5C7CB5AB22B5ABF0006AF81B /* WSEngine.swift in Sources */,
+				8A7A718821F8E1490061166D /* Transport.swift in Sources */,
+				8ABD4470224C036A00FB8370 /* Data+Extensions.swift in Sources */,
+				5C23C24521FBB0EE00D315F1 /* FoundationHTTPHandler.swift in Sources */,
+				5C85661D2257AE9D00A371DD /* WebSocketServer.swift in Sources */,
+				5CF1D0682253DD940081C8A8 /* Server.swift in Sources */,
+				8A906E3D2208BD9B0015057D /* Compression.swift in Sources */,
+				8A906E3F2208C7E80015057D /* WSCompression.swift in Sources */,
+				5C7CB5A722B59ABA006AF81B /* NativeEngine.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -251,11 +378,7 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = "";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				CODE_SIGN_IDENTITY = "-";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -265,12 +388,12 @@
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -279,22 +402,18 @@
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = "";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				CODE_SIGN_IDENTITY = "-";
 				INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -303,10 +422,7 @@
 			buildSettings = {
 				BITCODE_GENERATION_MODE = marker;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -315,18 +431,16 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MARKETING_VERSION = 4.0.2;
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				SDKROOT = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
-				VALID_ARCHS = "x86_64 i386 arm64 armv7s armv7 armv7k";
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
@@ -336,10 +450,7 @@
 			buildSettings = {
 				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -348,18 +459,16 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MARKETING_VERSION = 4.0.2;
 				OTHER_LDFLAGS = "-all_load";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				SDKROOT = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
-				VALID_ARCHS = "x86_64 i386 arm64 armv7s armv7 armv7k";
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
@@ -369,6 +478,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -377,12 +487,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -390,7 +502,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -413,12 +524,10 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
-				VALID_ARCHS = "x86_64 i386";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -429,6 +538,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -437,12 +547,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -450,7 +562,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -465,12 +576,10 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = "";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "x86_64 i386";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1020"
   version = "1.7">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -61,7 +60,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -0,0 +1,185 @@
+//
+//  FuzzingTests.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/28/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+
+import XCTest
+@testable import Starscream
+
+class FuzzingTests: XCTestCase {
+    
+    var websocket: WebSocket!
+    var server: MockServer!
+    var uuid = ""
+    
+    override func setUp() {
+        super.setUp()
+        
+        let s = MockServer()
+        let _ = s.start(address: "", port: 0)
+        server = s
+        
+        let transport = MockTransport(server: s)
+        uuid = transport.uuid
+        
+        let url = URL(string: "http://vluxe.io/ws")! //domain doesn't matter with the mock transport
+        let request = URLRequest(url: url)        
+        websocket = WebSocket(request: request, engine: WSEngine(transport: transport))
+        
+    }
+    
+    override func tearDown() {
+        super.tearDown()
+    }
+    
+    func runWebsocket(timeout: TimeInterval = 10, serverAction: @escaping ((ServerEvent) -> Bool)) {
+        let e = expectation(description: "Websocket event timeout")
+        server.onEvent = { event in
+            let done = serverAction(event)
+            if done {
+                e.fulfill()
+            }
+        }
+        
+        websocket.onEvent = { event in
+            switch event {
+            case .text(let string):
+                self.websocket.write(string: string)
+            case .binary(let data):
+                self.websocket.write(data: data)
+            case .ping(_):
+                break
+            case .pong(_):
+                break
+            case .connected(_):
+                break
+            case .disconnected(let reason, let code):
+                print("reason: \(reason) code: \(code)")
+            case .error(_):
+                break
+            case .viabilityChanged(_):
+                break
+            case .reconnectSuggested(_):
+                break
+            case .cancelled:
+                break
+            }
+        }
+        websocket.connect()
+        waitForExpectations(timeout: timeout) { error in
+            if let error = error {
+                XCTFail("waitForExpectationsWithTimeout errored: \(error)")
+            }
+        }
+    }
+    
+    func sendMessage(string: String, isBinary: Bool) {
+        let payload = string.data(using: .utf8)!
+        let code: FrameOpCode = isBinary ? .binaryFrame : .textFrame
+        runWebsocket { event in
+            switch event {
+            case .connected(let conn, _):
+                conn.write(data: payload, opcode: code)
+            case .text(let conn, let text):
+                if text == string && !isBinary {
+                    conn.write(data: Data(), opcode: .connectionClose)
+                    return true //success!
+                } else {
+                    XCTFail("text does not match: source: [\(string)] response: [\(text)]")
+                }
+            case .binary(let conn, let data):
+                if payload.count == data.count && isBinary {
+                    conn.write(data: Data(), opcode: .connectionClose)
+                    return true //success!
+                } else {
+                    XCTFail("binary does not match: source: [\(payload.count)] response: [\(data.count)]")
+                }
+                case .disconnected(_, _, _):
+                    return false
+            default:
+                XCTFail("recieved unexpected server event: \(event)")
+            }
+            return false
+        }
+    }
+    
+    //These are the Autobahn test cases as unit tests
+    
+    
+    /// MARK : - Framing cases
+    
+    // case 1.1.1
+    func testCase1() {
+        sendMessage(string: "", isBinary: false)
+    }
+    
+    // case 1.1.2
+    func testCase2() {
+        sendMessage(string: String(repeating: "*", count: 125), isBinary: false)
+    }
+    
+    // case 1.1.3
+    func testCase3() {
+        sendMessage(string: String(repeating: "*", count: 126), isBinary: false)
+    }
+    
+    // case 1.1.4
+    func testCase4() {
+        sendMessage(string: String(repeating: "*", count: 127), isBinary: false)
+    }
+    
+    // case 1.1.5
+    func testCase5() {
+        sendMessage(string: String(repeating: "*", count: 128), isBinary: false)
+    }
+    
+    // case 1.1.6
+    func testCase6() {
+        sendMessage(string: String(repeating: "*", count: 65535), isBinary: false)
+    }
+    
+    // case 1.1.7, 1.1.8
+    func testCase7() {
+        sendMessage(string: String(repeating: "*", count: 65536), isBinary: false)
+    }
+    
+    // case 1.2.1
+    func testCase9() {
+        sendMessage(string: "", isBinary: true)
+    }
+    
+    // case 1.2.2
+    func testCase10() {
+        sendMessage(string: String(repeating: "*", count: 125), isBinary: true)
+    }
+    
+    // case 1.2.3
+    func testCase11() {
+        sendMessage(string: String(repeating: "*", count: 126), isBinary: true)
+    }
+    
+    // case 1.2.4
+    func testCase12() {
+        sendMessage(string: String(repeating: "*", count: 127), isBinary: true)
+    }
+    
+    // case 1.2.5
+    func testCase13() {
+        sendMessage(string: String(repeating: "*", count: 128), isBinary: true)
+    }
+    
+    // case 1.2.6
+    func testCase14() {
+        sendMessage(string: String(repeating: "*", count: 65535), isBinary: true)
+    }
+    
+    // case 1.2.7, 1.2.8
+    func testCase15() {
+        sendMessage(string: String(repeating: "*", count: 65536), isBinary: true)
+    }
+    
+    //TODO: the rest of them.
+}
@@ -0,0 +1,130 @@
+//
+//  MockServer.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/29/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+
+import Foundation
+@testable import Starscream
+
+public class MockConnection: Connection, HTTPServerDelegate, FramerEventClient, FrameCollectorDelegate {
+    let transport: MockTransport
+    private let httpHandler = FoundationHTTPServerHandler()
+    private let framer = WSFramer(isServer: true)
+    private let frameHandler = FrameCollector()
+    private var didUpgrade = false
+    public var onEvent: ((ConnectionEvent) -> Void)?
+    fileprivate weak var delegate: ConnectionDelegate?
+    
+    init(transport: MockTransport) {
+        self.transport = transport
+        httpHandler.register(delegate: self)
+        framer.register(delegate: self)
+        frameHandler.delegate = self
+    }
+    
+    func add(data: Data) {
+        if !didUpgrade {
+            httpHandler.parse(data: data)
+        } else {
+            framer.add(data: data)
+        }
+    }
+    
+    public func write(data: Data, opcode: FrameOpCode) {
+        let wsData = framer.createWriteFrame(opcode: opcode, payload: data, isCompressed: false)
+        transport.received(data: wsData)
+    }
+    
+    /// MARK: - HTTPServerDelegate
+    
+    public func didReceive(event: HTTPEvent) {
+        switch event {
+        case .success(let headers):
+            didUpgrade = true
+            //TODO: add headers and key check?
+            let response = httpHandler.createResponse(headers: [:])
+            transport.received(data: response)
+            delegate?.didReceive(event: .connected(self, headers))
+            onEvent?(.connected(headers))
+        case .failure(let error):
+            onEvent?(.error(error))
+        }
+    }
+    
+    /// MARK: - FrameCollectorDelegate
+    
+    public func frameProcessed(event: FrameEvent) {
+        switch event {
+        case .frame(let frame):
+            frameHandler.add(frame: frame)
+        case .error(let error):
+            onEvent?(.error(error))
+        }
+    }
+    
+    public func didForm(event: FrameCollector.Event) {
+        switch event {
+        case .text(let string):
+            delegate?.didReceive(event: .text(self, string))
+            onEvent?(.text(string))
+        case .binary(let data):
+            delegate?.didReceive(event: .binary(self, data))
+            onEvent?(.binary(data))
+        case .pong(let data):
+            delegate?.didReceive(event: .pong(self, data))
+            onEvent?(.pong(data))
+        case .ping(let data):
+            delegate?.didReceive(event: .ping(self, data))
+            onEvent?(.ping(data))
+        case .closed(let reason, let code):
+            delegate?.didReceive(event: .disconnected(self, reason, code))
+            onEvent?(.disconnected(reason, code))
+        case .error(let error):
+            onEvent?(.error(error))
+        }
+    }
+    
+    public func decompress(data: Data, isFinal: Bool) -> Data? {
+        return nil
+    }
+}
+    
+
+public class MockServer: Server, ConnectionDelegate {
+    fileprivate var connections = [String: MockConnection]()
+    
+    public var onEvent: ((ServerEvent) -> Void)?
+    
+    public func start(address: String, port: UInt16) -> Error? {
+        return nil
+    }
+    
+    public func connect(transport: MockTransport) {
+        let conn = MockConnection(transport: transport)
+        conn.delegate = self
+        connections[transport.uuid] = conn
+    }
+    
+    public func disconnect(uuid: String) {
+//        guard let conn = connections[uuid] else {
+//            return
+//        }
+        //TODO: force disconnect
+        connections.removeValue(forKey: uuid)
+    }
+    
+    public func write(data: Data, uuid: String) {
+        guard let conn = connections[uuid] else {
+            return
+        }
+        conn.add(data: data)
+    }
+    
+    /// MARK: - MockConnectionDelegate
+    public func didReceive(event: ServerEvent) {
+        onEvent?(event)
+    }
+}
@@ -0,0 +1,65 @@
+//
+//  MockTransport.swift
+//  Starscream
+//
+//  Created by Dalton Cherry on 1/28/19.
+//  Copyright © 2019 Vluxe. All rights reserved.
+//
+
+import Foundation
+@testable import Starscream
+
+public class MockTransport: Transport {
+    
+    public var usingTLS: Bool {
+        return false
+    }
+    private weak var delegate: TransportEventClient?
+    
+    private let id: String
+    weak var server: MockServer?
+    var uuid: String {
+        return id
+    }
+    
+    public init(server: MockServer) {
+        self.server = server
+        self.id = UUID().uuidString
+    }
+    
+    public func register(delegate: TransportEventClient) {
+        self.delegate = delegate
+    }
+    
+   public func connect(url: URL, timeout: Double, certificatePinning: CertificatePinning?) {
+        server?.connect(transport: self)
+        delegate?.connectionChanged(state: .connected)
+    }
+    
+    public func disconnect() {
+        server?.disconnect(uuid: uuid)
+    }
+    
+    public func write(data: Data, completion: @escaping ((Error?) -> ())) {
+        server?.write(data: data, uuid: uuid)
+    }
+    
+    public func received(data: Data) {
+        delegate?.connectionChanged(state: .receive(data))
+    }
+    
+    public func getSecurityData() -> (SecTrust?, String?) {
+        return (nil, nil)
+    }
+}
+
+public class MockSecurity: CertificatePinning, HeaderValidator {
+    
+    public func evaluateTrust(trust: SecTrust, domain: String?, completion: ((PinningState) -> ())) {
+        completion(.success)
+    }
+
+    public func validate(headers: [String: String], key: String) -> Error? {
+        return nil
+    }
+}
@@ -1,6 +1,6 @@
 #!/bin/bash

-set -o pipefail && xcodebuild -project Starscream.xcodeproj -scheme Starscream CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build | xcpretty
+set -o pipefail && xcodebuild -project Starscream.xcodeproj -scheme Starscream CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO build | xcpretty
 swift build
 pod repo update
-pod lib lint --verbose
+pod lib lint --verbose --allow-warnings
@@ -12,18 +12,11 @@
 		5C178E271B62D0B900A97204 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E251B62D0B900A97204 /* Main.storyboard */; };
 		5C178E291B62D0B900A97204 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E281B62D0B900A97204 /* Images.xcassets */; };
 		5C178E2C1B62D0B900A97204 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */; };
-		5C178E381B62D0B900A97204 /* AutobahnTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E371B62D0B900A97204 /* AutobahnTests.swift */; };
 		5C178E521B62D11200A97204 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C178E491B62D0EF00A97204 /* Starscream.framework */; };
+		5CF1D07222552B770081C8A8 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5C178E491B62D0EF00A97204 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
-		5C178E321B62D0B900A97204 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5C178E141B62D0B900A97204 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 5C178E1B1B62D0B900A97204;
-			remoteInfo = Autobahn;
-		};
 		5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
@@ -31,50 +24,43 @@
 			remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
 			remoteInfo = Starscream;
 		};
-		5C178E4A1B62D0EF00A97204 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 6B3E79F119D48B7F006071F7;
-			remoteInfo = StarscreamTests;
-		};
-		5C178E4C1B62D0EF00A97204 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
-			remoteInfo = StarscreamOSX;
-		};
-		5C178E4E1B62D0EF00A97204 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D9C3E36919E48FF1009FC285;
-			remoteInfo = StarscreamOSXTests;
-		};
 		5C178E501B62D10A00A97204 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
+			remoteGlobalIDString = 33CCF0841F5DDC030099B092;
 			remoteInfo = Starscream;
 		};
-		5C42C3D51D8DF51C00947AA2 /* PBXContainerItemProxy */ = {
+		5CF1D06B22552AA30081C8A8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 091277971BD673A70003036D;
-			remoteInfo = "Starscream tvOS";
+			remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
+			remoteInfo = "Starscream Tests";
 		};
-		5C42C3D71D8DF51C00947AA2 /* PBXContainerItemProxy */ = {
+		5CF1D07322552B770081C8A8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 091277A01BD673A70003036D;
-			remoteInfo = "Starscream tvOSTests";
+			proxyType = 1;
+			remoteGlobalIDString = 33CCF0841F5DDC030099B092;
+			remoteInfo = Starscream;
 		};
 /* End PBXContainerItemProxy section */

+/* Begin PBXCopyFilesBuildPhase section */
+		5CF1D07522552B770081C8A8 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				5CF1D07222552B770081C8A8 /* Starscream.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		5C178E1C1B62D0B900A97204 /* Autobahn.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Autobahn.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C178E201B62D0B900A97204 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -83,9 +69,6 @@
 		5C178E261B62D0B900A97204 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		5C178E281B62D0B900A97204 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		5C178E2B1B62D0B900A97204 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		5C178E311B62D0B900A97204 /* AutobahnTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AutobahnTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		5C178E361B62D0B900A97204 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		5C178E371B62D0B900A97204 /* AutobahnTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutobahnTests.swift; sourceTree = "<group>"; };
 		5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../../Starscream.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@@ -98,13 +81,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5C178E2E1B62D0B900A97204 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
@@ -112,7 +88,6 @@
 			isa = PBXGroup;
 			children = (
 				5C178E1E1B62D0B900A97204 /* Autobahn */,
-				5C178E341B62D0B900A97204 /* AutobahnTests */,
 				5C178E1D1B62D0B900A97204 /* Products */,
 				5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */,
 			);
@@ -122,7 +97,6 @@
 			isa = PBXGroup;
 			children = (
 				5C178E1C1B62D0B900A97204 /* Autobahn.app */,
-				5C178E311B62D0B900A97204 /* AutobahnTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -148,32 +122,11 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		5C178E341B62D0B900A97204 /* AutobahnTests */ = {
-			isa = PBXGroup;
-			children = (
-				5C178E371B62D0B900A97204 /* AutobahnTests.swift */,
-				5C178E351B62D0B900A97204 /* Supporting Files */,
-			);
-			path = AutobahnTests;
-			sourceTree = "<group>";
-		};
-		5C178E351B62D0B900A97204 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				5C178E361B62D0B900A97204 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		5C178E421B62D0EF00A97204 /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				5C178E491B62D0EF00A97204 /* Starscream.framework */,
-				5C178E4B1B62D0EF00A97204 /* StarscreamTests.xctest */,
-				5C178E4D1B62D0EF00A97204 /* Starscream.framework */,
-				5C178E4F1B62D0EF00A97204 /* StarscreamOSXTests.xctest */,
-				5C42C3D61D8DF51C00947AA2 /* Starscream.framework */,
-				5C42C3D81D8DF51C00947AA2 /* Starscream tvOSTests.xctest */,
+				5CF1D06C22552AA30081C8A8 /* Starscream Tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -188,35 +141,19 @@
 				5C178E181B62D0B900A97204 /* Sources */,
 				5C178E191B62D0B900A97204 /* Frameworks */,
 				5C178E1A1B62D0B900A97204 /* Resources */,
+				5CF1D07522552B770081C8A8 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				5C178E511B62D10A00A97204 /* PBXTargetDependency */,
+				5CF1D07422552B770081C8A8 /* PBXTargetDependency */,
 			);
 			name = Autobahn;
 			productName = Autobahn;
 			productReference = 5C178E1C1B62D0B900A97204 /* Autobahn.app */;
 			productType = "com.apple.product-type.application";
 		};
-		5C178E301B62D0B900A97204 /* AutobahnTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 5C178E3E1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "AutobahnTests" */;
-			buildPhases = (
-				5C178E2D1B62D0B900A97204 /* Sources */,
-				5C178E2E1B62D0B900A97204 /* Frameworks */,
-				5C178E2F1B62D0B900A97204 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				5C178E331B62D0B900A97204 /* PBXTargetDependency */,
-			);
-			name = AutobahnTests;
-			productName = AutobahnTests;
-			productReference = 5C178E311B62D0B900A97204 /* AutobahnTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 /* End PBXNativeTarget section */

 /* Begin PBXProject section */
@@ -232,11 +169,6 @@
 						CreatedOnToolsVersion = 6.4;
 						LastSwiftMigration = 0800;
 					};
-					5C178E301B62D0B900A97204 = {
-						CreatedOnToolsVersion = 6.4;
-						LastSwiftMigration = 0800;
-						TestTargetID = 5C178E1B1B62D0B900A97204;
-					};
 				};
 			};
 			buildConfigurationList = 5C178E171B62D0B900A97204 /* Build configuration list for PBXProject "Autobahn" */;
@@ -244,6 +176,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -259,7 +192,6 @@
 			projectRoot = "";
 			targets = (
 				5C178E1B1B62D0B900A97204 /* Autobahn */,
-				5C178E301B62D0B900A97204 /* AutobahnTests */,
 			);
 		};
 /* End PBXProject section */
@@ -272,39 +204,11 @@
 			remoteRef = 5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		5C178E4B1B62D0EF00A97204 /* StarscreamTests.xctest */ = {
+		5CF1D06C22552AA30081C8A8 /* Starscream Tests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = "Starscream iOSTests.xctest";
-			remoteRef = 5C178E4A1B62D0EF00A97204 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C178E4D1B62D0EF00A97204 /* Starscream.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Starscream.framework;
-			remoteRef = 5C178E4C1B62D0EF00A97204 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C178E4F1B62D0EF00A97204 /* StarscreamOSXTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Starscream OSXTests.xctest";
-			remoteRef = 5C178E4E1B62D0EF00A97204 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C42C3D61D8DF51C00947AA2 /* Starscream.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Starscream.framework;
-			remoteRef = 5C42C3D51D8DF51C00947AA2 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C42C3D81D8DF51C00947AA2 /* Starscream tvOSTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Starscream tvOSTests.xctest";
-			remoteRef = 5C42C3D71D8DF51C00947AA2 /* PBXContainerItemProxy */;
+			path = "Starscream Tests.xctest";
+			remoteRef = 5CF1D06B22552AA30081C8A8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -320,13 +224,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5C178E2F1B62D0B900A97204 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -339,27 +236,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5C178E2D1B62D0B900A97204 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				5C178E381B62D0B900A97204 /* AutobahnTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXTargetDependency section */
-		5C178E331B62D0B900A97204 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 5C178E1B1B62D0B900A97204 /* Autobahn */;
-			targetProxy = 5C178E321B62D0B900A97204 /* PBXContainerItemProxy */;
-		};
 		5C178E511B62D10A00A97204 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Starscream;
 			targetProxy = 5C178E501B62D10A00A97204 /* PBXContainerItemProxy */;
 		};
+		5CF1D07422552B770081C8A8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Starscream;
+			targetProxy = 5CF1D07322552B770081C8A8 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */

 /* Begin PBXVariantGroup section */
@@ -468,58 +357,26 @@
 		5C178E3C1B62D0B900A97204 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Autobahn/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		5C178E3D1B62D0B900A97204 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Autobahn/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
-			};
-			name = Release;
-		};
-		5C178E3F1B62D0B900A97204 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = AutobahnTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
-			};
-			name = Debug;
-		};
-		5C178E401B62D0B900A97204 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = AutobahnTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -544,15 +401,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		5C178E3E1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "AutobahnTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				5C178E3F1B62D0B900A97204 /* Debug */,
-				5C178E401B62D0B900A97204 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 5C178E141B62D0B900A97204 /* Project object */;
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }
@@ -1,5 +1,15 @@
 {
  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
    {
      "idiom" : "iphone",
      "size" : "29x29",
@@ -30,6 +40,16 @@
      "size" : "60x60",
      "scale" : "3x"
    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
    {
      "idiom" : "ipad",
      "size" : "29x29",
@@ -59,6 +79,16 @@
      "idiom" : "ipad",
      "size" : "76x76",
      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
    }
  ],
  "info" : {
@@ -18,33 +18,39 @@ class ViewController: UIViewController {
        super.viewDidLoad()
        getCaseCount()
        //getTestInfo(1)
+        //runTest(304)
    }
    
    func removeSocket(_ s: WebSocket?) {
-        socketArray = socketArray.filter{$0 != s}
+        guard let s = s else {return}
+        socketArray = socketArray.filter{$0 !== s}
    }
    
    func getCaseCount() {
-        
-        let s = WebSocket(url: URL(string: "ws://\(host)/getCaseCount")!, protocols: [])
+        let req = URLRequest(url: URL(string: "ws://\(host)/getCaseCount")!)
+        let s = WebSocket(request: req)
        socketArray.append(s)
-        s.onText = { [weak self]  (text: String) in
-            if let c = Int(text) {
-                print("number of cases is: \(c)")
-                self?.caseCount = c
+        s.onEvent = { [weak self] event in
+            switch event {
+            case .text(let string):
+                if let c = Int(string) {
+                    print("number of cases is: \(c)")
+                    self?.caseCount = c
+                }
+            case .disconnected(_, _):
+                self?.runTest(1)
+                self?.removeSocket(s)
+            default:
+                break
            }
        }
-        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
-            self?.getTestInfo(1)
-            self?.removeSocket(s)
-        }
        s.connect()
    }
    
    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!,
@@ -60,14 +66,19 @@ class ViewController: UIViewController {
 //                print("error parsing the json")
 //            }

-        }
+//        }
        var once = false
-        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
-            if !once {
-                once = true
-                self?.runTest(caseNum)
+        s.onEvent = { [weak self] event in
+            switch event {
+            case .disconnected(_, _), .error(_):
+                if !once {
+                    once = true
+                    self?.runTest(caseNum)
+                }
+                self?.removeSocket(s)
+            default:
+                break
            }
-            self?.removeSocket(s)
        }
        s.connect()
    }
@@ -75,92 +86,99 @@ class ViewController: UIViewController {
    func runTest(_ caseNum: Int) {
        let s = createSocket("runCase",caseNum)
        self.socketArray.append(s)
-        s.onText = { [weak s]  (text: String) in
-            s?.write(string: text)
-        }
-        s.onData = { [weak s]  (data: Data) in
-            s?.write(data: data)
-        }
+        
        var once = false
-        s.onDisconnect = {[weak self, weak s] (error: Error?) in
-            if !once {
-                once = true
-                print("case:\(caseNum) finished")
-                //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()
+        s.onEvent = { [weak self, weak s] event in
+            switch event {
+            case .disconnected(_, _), .error(_):
+                if !once {
+                    once = true
+                    print("case:\(caseNum) finished")
+                    //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)
                }
                self?.removeSocket(s)
+            case .text(let string):
+               s?.write(string: string)
+            case .binary(let data):
+               s?.write(data: data)
+//            case .error(let error):
+//                print("got an error: \(error)")
+            default:
+                break
            }
        }
        s.connect()
    }
    
-    func verifyTest(_ caseNum: Int) {
-        let s = createSocket("getCaseStatus",caseNum)
-        self.socketArray.append(s)
-        s.onText = { (text: String) in
-            let data = text.data(using: String.Encoding.utf8)
-            do {
-                let resp: Any? = try JSONSerialization.jsonObject(with: data!,
-                    options: JSONSerialization.ReadingOptions())
-                if let dict = resp as? Dictionary<String,String> {
-                    if let status = dict["behavior"] {
-                        if status == "OK" {
-                            print("SUCCESS: \(caseNum)")
-                            return
-                        }
-                    }
-                    print("FAILURE: \(caseNum)")
-                }
-            } catch {
-               print("error parsing the json")
-            }
-        }
-        var once = false
-        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
-            if !once {
-                once = true
-                let nextCase = caseNum+1
-                print("next test is: \(nextCase)")
-                if nextCase <= (self?.caseCount)! {
-                    self?.getTestInfo(nextCase)
-                } else {
-                    self?.finishReports()
-                }
-            }
-            self?.removeSocket(s)
-        }
-        s.connect()
-    }
+//    func verifyTest(_ caseNum: Int) {
+//        let s = createSocket("getCaseStatus",caseNum)
+//        self.socketArray.append(s)
+//        s.onText = { (text: String) in
+//            let data = text.data(using: String.Encoding.utf8)
+//            do {
+//                let resp: Any? = try JSONSerialization.jsonObject(with: data!,
+//                    options: JSONSerialization.ReadingOptions())
+//                if let dict = resp as? Dictionary<String,String> {
+//                    if let status = dict["behavior"] {
+//                        if status == "OK" {
+//                            print("SUCCESS: \(caseNum)")
+//                            return
+//                        }
+//                    }
+//                    print("FAILURE: \(caseNum)")
+//                }
+//            } catch {
+//               print("error parsing the json")
+//            }
+//        }
+//        var once = false
+//        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
+//            if !once {
+//                once = true
+//                let nextCase = caseNum+1
+//                print("next test is: \(nextCase)")
+//                if nextCase <= (self?.caseCount)! {
+//                    self?.getTestInfo(nextCase)
+//                } else {
+//                    self?.finishReports()
+//                }
+//            }
+//            self?.removeSocket(s)
+//        }
+//        s.connect()
+//    }
    
    func finishReports() {
        let s = createSocket("updateReports",0)
        self.socketArray.append(s)
-        s.onDisconnect = { [weak self, weak s]  (error: Error?) in
-            print("finished all the tests!")
-            self?.removeSocket(s)
+        s.onEvent = { [weak self, weak s] event in
+            switch event {
+            case .disconnected(_, _):
+                print("finished all the tests!")
+                self?.removeSocket(s)
+            default:
+                break
+            }
        }
        s.connect()
    }
    
    func createSocket(_ cmd: String, _ caseNum: Int) -> WebSocket {
-        return WebSocket(url: URL(string: "ws://\(host)\(buildPath(cmd,caseNum))")!, protocols: [])
+        let req = URLRequest(url: URL(string: "ws://\(host)\(buildPath(cmd,caseNum))")!)
+        //return WebSocket(request: req, compressionHandler: WSCompression())
+        return WebSocket(request: req)
    }
    
    func buildPath(_ cmd: String, _ caseNum: Int) -> String {
        return "/\(cmd)?case=\(caseNum)&agent=Starscream"
    }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
-
 }

@@ -1,36 +0,0 @@
-//
-//  AutobahnTests.swift
-//  AutobahnTests
-//
-//  Created by Dalton Cherry on 7/24/15.
-//  Copyright (c) 2015 vluxe. All rights reserved.
-//
-
-import UIKit
-import XCTest
-
-class AutobahnTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        XCTAssert(true, "Pass")
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure() {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}
@@ -1,24 +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>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
@@ -20,37 +20,9 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
+			remoteGlobalIDString = 33CCF0841F5DDC030099B092;
 			remoteInfo = Starscream;
 		};
-		5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
-			remoteInfo = StarscreamOSX;
-		};
-		5C06AE8C1B08044600D41060 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D9C3E36919E48FF1009FC285;
-			remoteInfo = StarscreamOSXTests;
-		};
-		5C42C3E01D8F31DC00947AA2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 091277971BD673A70003036D;
-			remoteInfo = "Starscream tvOS";
-		};
-		5C42C3E21D8F31DC00947AA2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 091277A01BD673A70003036D;
-			remoteInfo = "Starscream tvOSTests";
-		};
 		6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
@@ -58,12 +30,12 @@
 			remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
 			remoteInfo = Starscream;
 		};
-		6B3E7A0F19D48D00006071F7 /* PBXContainerItemProxy */ = {
+		8AF56D58224A80460020CD2F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 6B3E79F119D48B7F006071F7;
-			remoteInfo = StarscreamTests;
+			remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
+			remoteInfo = "Starscream Tests";
 		};
 /* End PBXContainerItemProxy section */

@@ -143,11 +115,7 @@
 			isa = PBXGroup;
 			children = (
 				6B3E7A0E19D48D00006071F7 /* Starscream.framework */,
-				6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */,
-				5C06AE8B1B08044600D41060 /* Starscream.framework */,
-				5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */,
-				5C42C3E11D8F31DC00947AA2 /* Starscream.framework */,
-				5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */,
+				8AF56D59224A80460020CD2F /* Starscream Tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -181,7 +149,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = vluxe;
 				TargetAttributes = {
 					5C765ADA199A6DAA003D9110 = {
@@ -192,7 +160,7 @@
 			};
 			buildConfigurationList = 5C765AD6199A6DAA003D9110 /* Build configuration list for PBXProject "SimpleTest" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -215,34 +183,6 @@
 /* End PBXProject section */

 /* Begin PBXReferenceProxy section */
-		5C06AE8B1B08044600D41060 /* Starscream.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Starscream.framework;
-			remoteRef = 5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Starscream OSXTests.xctest";
-			remoteRef = 5C06AE8C1B08044600D41060 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C42C3E11D8F31DC00947AA2 /* Starscream.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Starscream.framework;
-			remoteRef = 5C42C3E01D8F31DC00947AA2 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Starscream tvOSTests.xctest";
-			remoteRef = 5C42C3E21D8F31DC00947AA2 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		6B3E7A0E19D48D00006071F7 /* Starscream.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -250,11 +190,11 @@
 			remoteRef = 6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */ = {
+		8AF56D59224A80460020CD2F /* Starscream Tests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = "Starscream iOSTests.xctest";
-			remoteRef = 6B3E7A0F19D48D00006071F7 /* PBXContainerItemProxy */;
+			path = "Starscream Tests.xctest";
+			remoteRef = 8AF56D58224A80460020CD2F /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -307,6 +247,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -315,12 +256,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -360,6 +303,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -368,12 +312,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -408,10 +354,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				INFOPLIST_FILE = SimpleTest/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -421,10 +368,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				INFOPLIST_FILE = SimpleTest/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1,10 +1,24 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  AppDelegate.swift
 //  SimpleTest
 //
 //  Created by Dalton Cherry on 8/12/14.
-//  Copyright (c) 2014 vluxe. All rights reserved.
+//  Copyright © 2014 Vluxe. All rights reserved.
 //
+//  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 UIKit

@@ -14,7 +28,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    var window: UIWindow?


-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
        // Override point for customization after application launch.
        return true
    }
@@ -22,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -1,48 +1,93 @@
+//////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  ViewController.swift
 //  SimpleTest
 //
 //  Created by Dalton Cherry on 8/12/14.
-//  Copyright (c) 2014 vluxe. All rights reserved.
+//  Copyright © 2014 Vluxe. All rights reserved.
 //
+//  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 UIKit
 import Starscream

 class ViewController: UIViewController, WebSocketDelegate {
    var socket: WebSocket!
+    var isConnected = false
+    let server = WebSocketServer()
    
    override func viewDidLoad() {
        super.viewDidLoad()
-        var request = URLRequest(url: URL(string: "http://localhost:8080")!)
+//        let err = server.start(address: "localhost", port: 8080)
+//        if err != nil {
+//            print("server didn't start!")
+//        }
+//        server.onEvent = { event in
+//            switch event {
+//            case .text(let conn, let string):
+//                let payload = string.data(using: .utf8)!
+//                conn.write(data: payload, opcode: .textFrame)
+//            default:
+//                break
+//            }
+//        }
+        //https://echo.websocket.org
+        var request = URLRequest(url: URL(string: "http://localhost:8080")!) //https://localhost:8080
        request.timeoutInterval = 5
        socket = WebSocket(request: request)
        socket.delegate = self
        socket.connect()
    }
    
-    // MARK: Websocket Delegate Methods.
-    
-    func websocketDidConnect(socket: WebSocketClient) {
-        print("websocket is connected")
-    }
-    
-    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")
+    // MARK: - WebSocketDelegate
+    func didReceive(event: WebSocketEvent, client: WebSocket) {
+        switch event {
+        case .connected(let headers):
+            isConnected = true
+            print("websocket is connected: \(headers)")
+        case .disconnected(let reason, let code):
+            isConnected = false
+            print("websocket is disconnected: \(reason) with code: \(code)")
+        case .text(let string):
+            print("Received text: \(string)")
+        case .binary(let data):
+            print("Received data: \(data.count)")
+        case .ping(_):
+            break
+        case .pong(_):
+            break
+        case .viabilityChanged(_):
+            break
+        case .reconnectSuggested(_):
+            break
+        case .cancelled:
+            isConnected = false
+        case .error(let error):
+            isConnected = false
+            handleError(error)
        }
    }
    
-    func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
-        print("Received text: \(text)")
-    }
-    
-    func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
-        print("Received data: \(data.count)")
+    func handleError(_ error: Error?) {
+        if let e = error as? WSError {
+            print("websocket encountered an error: \(e.message)")
+        } else if let e = error {
+            print("websocket encountered an error: \(e.localizedDescription)")
+        } else {
+            print("websocket encountered an error")
+        }
    }
    
    // MARK: Write Text Action
@@ -54,7 +99,7 @@ class ViewController: UIViewController, WebSocketDelegate {
    // MARK: Disconnect Action
    
    @IBAction func disconnect(_ sender: UIBarButtonItem) {
-        if socket.isConnected {
+        if isConnected {
            sender.title = "Connect"
            socket.disconnect()
        } else {
@@ -19,7 +19,7 @@ EM.run {

    ws.onmessage { |msg|
      puts "message from client: #{msg}"
-      ws.send Faker::Hacker.say_something_smart
+      ws.send +Faker::Hacker.say_something_smart
    }
  end
 }
@@ -3,7 +3,7 @@ default_platform(:ios)
 update_fastlane

 platform :ios do
-  desc "Depoy new version"
+  desc "Deploy new version"
  lane :release do
    ensure_git_branch
    version = version_get_podspec(path: "Starscream.podspec")
@@ -20,7 +20,7 @@ or alternatively using `brew cask install fastlane`
 ```
 fastlane ios release
 ```
-Depoy new version
+Deploy new version

 ----
Author	SHA1	Message	Date
daltoniam	339ca39461	improved native engine and a few bug fixes	2020-04-06 14:29:55 -05:00
Dalton	4e8973e3fc	Merge pull request #697 from mikaryyn/feature/v4-refactor Fix for a buffer overflow when close code has not been received from the socket	2020-04-06 14:16:00 -05:00
daltoniam	990a4c858e	enabled native engine. Updated Changelog and README	2020-04-04 14:28:42 -05:00
Dalton	3b4c81547a	Merge pull request #755 from dylanmaryk/patch-1 Fix "viabilityChanged" typos	2020-04-04 13:57:40 -05:00
Dalton	9e8fcba42e	Merge pull request #749 from YellEngineering/feature/fix-foundation-transport-tls Enable SSL in FoundationTransport for secure hosts	2020-04-04 13:57:16 -05:00
Dylan Maryk	d84552f944	Fix typo	2020-03-27 17:54:35 +01:00
Dylan Maryk	c3ac0a9df7	Fix typo	2020-03-27 17:50:56 +01:00
Nick Dowell	97538bc11d	Enable SSL in FoundationTransport for secure hosts This fixes connection to secure hosts such as wss://echo.websocket.org	2020-03-11 16:03:14 +00:00
Patrick Maltagliati	4e8dca654d	Use the host for evaluating trust, not the entire URL (#721 ) * Use the host for evaluating trust, not the entire URL * Get host from URLParts	2020-01-13 14:46:07 -06:00
Kristaps Grinbergs	547cb80ef6	Update Travis CI build (#723 ) Update Travis CI build	2020-01-06 11:03:23 +02:00
Kristaps Grinbergs	12946fc610	Update Travis CI build	2020-01-06 10:43:29 +02:00
daltoniam	850f620441	resolved conflicts	2020-01-02 16:38:34 -06:00
daltoniam	ced0725e4b	update gem file to remove warnings	2020-01-02 16:37:50 -06:00
Dalton	9d1bac8ede	Merge pull request #716 from TomasLinhart/macCatalystSupport Add macCatalyst support	2020-01-02 16:09:54 -06:00
Dalton	eb29f2a1f9	Merge pull request #713 from daltoniam/dependabot/bundler/rubyzip-1.3.0 Bump rubyzip from 1.2.2 to 1.3.0	2020-01-02 16:09:00 -06:00
Dalton	9cf7b4dfcb	Merge pull request #718 from daltoniam/dependabot/bundler/excon-0.71.0 Bump excon from 0.64.0 to 0.71.0	2020-01-02 16:08:38 -06:00
Dalton	6b2742542c	Merge pull request #653 from daltoniam/feature/v4-refactor v4 Refactor Notice (WIP)	2020-01-02 15:57:37 -06:00
daltoniam	e14338dd1d	resolved conflicts	2020-01-02 15:47:03 -06:00
daltoniam	0cea1194d2	resolved conflicts	2020-01-02 15:39:22 -06:00
dependabot[bot]	a986e38e56	Bump excon from 0.64.0 to 0.71.0 Bumps [excon](https://github.com/excon/excon) from 0.64.0 to 0.71.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.64.0...v0.71.0) Signed-off-by: dependabot[bot] <support@github.com>	2019-12-16 22:06:19 +00:00
Tomas Linhart	692f3cb14a	Allow running tests with macCatalyst	2019-11-25 16:53:23 +11:00
Tomas Linhart	e8c0e894aa	Add macCatalyst support	2019-11-25 16:44:01 +11:00
dependabot[bot]	b7e98e147f	Bump rubyzip from 1.2.2 to 1.3.0 Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.2...v1.3.0) Signed-off-by: dependabot[bot] <support@github.com>	2019-11-14 12:24:24 +00:00
Kristaps Grinbergs	e6b65c6d90	Merge pull request #704 from dessmith/bugfix/plist-version-number-correction Fix version number	2019-10-14 07:36:10 +03:00
Desmond Smith	7ce91f71ca	Fix version number Version number in Info.plist was not incremented in version 3.1.0	2019-10-10 16:06:53 +01:00
daltoniam	83ae006b5c	fixed the unit tests	2019-10-01 20:02:10 -05:00
daltoniam	394afb99a9	README update and travis to xcode 11	2019-09-24 20:08:58 -05:00
Mika Ryynänen	281a49edd8	Fix for a buffer overflow when close code has not been received from the socket.	2019-09-24 13:13:36 +03:00
daltoniam	109dd033fc	fixed the build	2019-09-22 16:30:55 -05:00
daltoniam	136274da76	WatchOS ifdef checks	2019-08-27 22:21:58 -05:00
daltoniam	6e3b96ace5	CI fixes by readding watchOS support of raw string parsing for HTTP header	2019-08-25 19:22:07 -05:00
daltoniam	b8c4183d68	fixed conflicts	2019-08-10 12:36:50 -05:00
daltoniam	839bf25f59	disabled native websocket until offical release	2019-08-10 12:32:21 -05:00
daltoniam	c946f5c68b	laid the ground work for supporting both the native API and backwards compatibility with old versions	2019-06-15 18:40:22 -05:00
Kristaps Grinbergs	a2ed45c0b2	Update gems and allow warnings for now	2019-05-05 17:42:46 +03:00
Kristaps Grinbergs	ccb32575e5	Bump Xcode version	2019-05-04 20:10:55 +03:00
Austin Cherry	9164a09cf5	Merge pull request #644 from AccioSupport/master [README] Document installation via Accio	2019-04-27 18:55:05 -05:00
Austin Cherry	b386d1ea5a	Cleaned up docs, example project, licensing, etc	2019-04-27 18:42:30 -05:00
Austin Cherry	c0d564fcc1	Added Certificate Pinning Support	2019-04-27 16:48:37 -05:00
Kristaps Grinbergs	a9625bf474	Merge pull request #650 from pducks32/patch-1 Fix typo in Fastfile	2019-04-25 10:54:12 +03:00
Patrick Metcalfe	e68b2f7427	Fix typo in Fastfile	2019-04-24 10:07:29 -07:00
Kristaps Grinbergs	1d81b781e9	Adding support for zlib in linux	2019-04-22 12:42:31 +03:00
daltoniam	ebcc04315d	added Network framework server	2019-04-05 12:17:26 -05:00
Cihat Gündüz	692d55c76a	[README] Document installation via Accio	2019-04-05 17:31:18 +02:00
daltoniam	520e510c2c	basic server support for unit tests	2019-04-04 16:20:22 -05:00
daltoniam	4993e492d7	disabled pod lint for now	2019-03-30 22:13:52 -05:00
daltoniam	d944b0df20	package manager fix	2019-03-30 22:08:46 -05:00
daltoniam	522b7e74ee	updated travis for swift 5 build	2019-03-30 21:41:17 -05:00
daltoniam	a664af674e	updated travis for swift 5	2019-03-30 21:26:03 -05:00
daltoniam	ec0953ee73	tests are building again	2019-03-30 21:20:04 -05:00
Dalton Cherry	21c38d3c1f	changed simple test back	2019-03-27 14:26:25 -05:00
Dalton Cherry	1cbfd8126c	swift 5 update	2019-03-27 14:19:57 -05:00
Kristaps Grinbergs	9c03ef715d	Merge pull request #636 from daltoniam/swift_5 Swift 5 support	2019-03-26 11:11:18 +07:00
Kristaps Grinbergs	7860785cf3	Added version for Swift 4.2	2019-03-26 11:10:59 +07:00
Kristaps Grinbergs	b1312f8af1	Fix warnings about project file	2019-03-26 11:04:18 +07:00
Dalton Cherry	0e6bdc81e1	start of security. SSL pinning next	2019-03-22 11:12:49 -05:00
Kristaps Grinbergs	514eb3ddb9	Merge pull request #628 from yamoridon/ws-server-frozen-string Fix FrozenError in ws-server.rb	2019-03-01 08:33:43 +07:00
Kazuki Ohara	4c48638295	Fix FrozenError in ws-server.rb	2019-03-01 00:28:36 +09:00
Kristaps Grinbergs	429bd1a0b7	Swift 5 support	2019-02-22 16:09:03 +02:00
Kristaps Grinbergs	5ecb5fd499	Merge pull request #618 from c0diq/fix-archs-2 Better way to fix archs	2019-02-11 10:16:25 +02:00
daltoniam	63b76e1fd9	finished up some of the TODOs	2019-02-09 12:04:04 -06:00
daltoniam	db7685cf93	off by one	2019-02-09 10:54:36 -06:00
daltoniam	5abcb7f11b	updated simple test	2019-02-09 10:50:21 -06:00
Sylvain Rebaud	fbd80c2367	Better way to fix archs	2019-02-09 03:10:52 -08:00
Dalton Cherry	75236d6cc7	fixed conflicts	2019-02-08 11:05:54 -06:00
Dalton Cherry	5f467266fc	got compression hooked up	2019-02-08 11:04:46 -06:00
daltoniam	12e668f84b	foundation HTTP request creation	2019-02-07 18:01:23 -06:00
Kristaps Grinbergs	40cda44e40	Merge pull request #616 from c0diq/fix-archs Fix Xcode 10.1 valid archs warnings	2019-02-06 17:55:17 +02:00
Sylvain Rebaud	51ee77cf6c	Fix Xcode 10.1 valid archs warnings	2019-02-05 21:36:45 -08:00
daltoniam	c639b64972	HTTP connetion work	2019-02-05 07:06:29 -06:00
Dalton Cherry	7bb64ba35c	writing queue added. Compression stubbed out. Framing refactor is done	2019-02-04 13:54:47 -06:00
Kristaps Grinbergs	de293c4b26	Merge pull request #614 from c0diq/fix-code-signing Fix code signing	2019-02-02 20:19:17 +02:00
Sylvain Rebaud	688bd32df8	Fix Tests	2019-01-25 14:20:41 -08:00
Sylvain Rebaud	ee00c1dfdd	Fix incorrect code signing There’s no need to define code signing for frameworks. If hardcoding iOS Developer, this would prevent a framework from getting signed for Enterprise.	2019-01-25 14:20:41 -08:00
Dalton Cherry	f8238c495d	proper offset	2019-01-25 09:48:32 -06:00
Dalton Cherry	2d059501d1	start and layout of refactored code base	2019-01-24 14:35:14 -06:00
Kristaps Grinbergs	07e09a8ab3	Merge pull request #603 from turingvideo/master Static queue can cause unexpected timeout when there are multiple ws connections.	2019-01-17 18:32:05 +02:00
Sen Liu	d58f0a4436	fix	2018-12-21 10:59:36 -08:00
Sen Liu	36254e8945	fix static queue issues	2018-12-14 16:34:15 -08:00
Kristaps Grinbergs	9b942131d5	Merge pull request #590 from sirlantis/patch-1 Don't add empty Sec-WebSocket-Protocol header	2018-10-29 15:04:45 +02:00
Marcel Jackwerth	108aa5e4c8	Don't add empty Sec-WebSocket-Protocol header > The request MAY include a header field with the name > \|Sec-WebSocket-Protocol\|. If present, this value indicates one > or more comma-separated subprotocol the client wishes to speak, > ordered by preference. > > -- The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) Passing an empty / neutral array should be the same as passing `nil` here. The WebSocket API (in Browsers) also seems to treat `null` and `[]` the same. Preferably the initializer signature should be `protocols: [String] = []`, but that would make this a breaking change.	2018-10-29 13:13:25 +01:00
Kristaps Grinbergs	c72659bd32	Added 3.0.6 to changelog	2018-10-10 15:08:57 +03:00