Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Kristaps Grinbergs
|
4534f9ca29 | ||
|
Kristaps Grinbergs
|
5527c29d21 | ||
|
Kristaps Grinbergs
|
bc6c868641 | ||
 Daniel Hallman
|
0b10d3e21e | ||
 Olli Tapaninen
|
a109616d95 | ||
 Olli Tapaninen
|
5f6b4d235f | ||
|
Olli Tapaninen
|
c0123b373c | ||
 daltoniam
|
d14d4af2e7 | ||
|
daltoniam
|
ed6eee4155 | ||
|
Dalton
|
b59d3e1512 | ||
 Kristaps Grinbergs
|
69a0180e2c | ||
|
daltoniam
|
12cdf2bce2 |
@@ -1,25 +0,0 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Create a report about a bug
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
### Describe the bug
|
||||
> A clear and concise description of what the bug is.
|
||||
|
||||
### Steps to Reproduce
|
||||
> Detailed steps to reproduce the problematic behavior:
|
||||
|
||||
### Expected behavior
|
||||
> A clear and concise description of what you expected to happen.
|
||||
|
||||
### Environment:
|
||||
- OS/Version: [e.g. iOS/13.3]
|
||||
- Starscream Version [e.g. 4.0.4]
|
||||
- Xcode version [e.g. 11.5]
|
||||
|
||||
### Additional context
|
||||
> Add any other context about the problem here.
|
||||
@@ -1 +0,0 @@
|
||||
blank_issues_enabled: false
|
||||
@@ -1,23 +0,0 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: ''
|
||||
labels: feature_request
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
### What do you want to happen?
|
||||
> Please replace this with the general overview of the feature that you'd like to have.
|
||||
|
||||
### What happens now?
|
||||
> Please replace this with of what is happening currently.
|
||||
|
||||
### Demo Code
|
||||
> Any demo code that may used to implement/use the desired feature.
|
||||
|
||||
### Describe alternatives you've considered
|
||||
> A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
### Additional context
|
||||
> Add any other context or screenshots about the feature request here.
|
||||
@@ -1,16 +0,0 @@
|
||||
---
|
||||
name: General Question
|
||||
about: 'Ask any question about the framework. '
|
||||
title: ''
|
||||
labels: question
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
### Question
|
||||
> A description of what you want to know.
|
||||
|
||||
### Environment:
|
||||
- OS/Version: [e.g. iOS/13.3]
|
||||
- Starscream Version [e.g. 4.0.4]
|
||||
- Xcode version [e.g. 11.5]
|
||||
@@ -1,8 +0,0 @@
|
||||
### Issue Link 🔗
|
||||
> Please attach the link to an issue if it exists.
|
||||
|
||||
### Goals ⚽
|
||||
> What you hope to address within this PR.
|
||||
|
||||
### Implementation Details 🚧
|
||||
> Additional details about the PR.
|
||||
@@ -1,24 +0,0 @@
|
||||
name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "*.*.*"
|
||||
jobs:
|
||||
release:
|
||||
runs-on: macos-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set Latest Tag
|
||||
id: vars
|
||||
run: echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
|
||||
- uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
|
||||
- run: bundle exec fastlane test
|
||||
- run: bundle exec fastlane release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
|
||||
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
|
||||
TAG: ${{ steps.vars.outputs.tag }}
|
||||
@@ -1 +0,0 @@
|
||||
3.2.2
|
||||
@@ -0,0 +1,7 @@
|
||||
osx_image: xcode10
|
||||
language: objective-c
|
||||
before_install:
|
||||
- gem install cocoapods --pre
|
||||
- gem cleanup
|
||||
script:
|
||||
- ./build.sh
|
||||
+7
-53
@@ -2,52 +2,6 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
`Starscream` adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
### [4.0.4](https://github.com/daltoniam/Starscream/tree/4.0.4)
|
||||
|
||||
Bug fixes for 4.0.3.
|
||||
|
||||
[#808](https://github.com/daltoniam/Starscream/pull/808)
|
||||
[#807](https://github.com/daltoniam/Starscream/pull/807)
|
||||
[#799](https://github.com/daltoniam/Starscream/pull/799)
|
||||
[#797](https://github.com/daltoniam/Starscream/pull/797)
|
||||
[#790](https://github.com/daltoniam/Starscream/pull/790)
|
||||
[#788](https://github.com/daltoniam/Starscream/pull/788)
|
||||
[#777](https://github.com/daltoniam/Starscream/pull/777)
|
||||
[#768](https://github.com/daltoniam/Starscream/pull/768)
|
||||
[#766](https://github.com/daltoniam/Starscream/pull/766)
|
||||
[#764](https://github.com/daltoniam/Starscream/pull/764)
|
||||
|
||||
### [4.0.3](https://github.com/daltoniam/Starscream/tree/4.0.3)
|
||||
|
||||
Bug fixes for 4.0.2.
|
||||
|
||||
[#760](https://github.com/daltoniam/Starscream/issues/760)
|
||||
|
||||
### [4.0.2](https://github.com/daltoniam/Starscream/tree/4.0.2)
|
||||
|
||||
Bug fixes for 4.0.1. Fixed native engine is connected/disconnected. Native engine isn't the default since the API lacks features.
|
||||
|
||||
[#697](https://github.com/daltoniam/Starscream/pull/697)
|
||||
|
||||
### [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
|
||||
@@ -195,14 +149,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)
|
||||
@@ -213,7 +167,7 @@ Fixed:
|
||||
|
||||
Added Swift 3 support.
|
||||
|
||||
Fixed:
|
||||
Fixed:
|
||||
[#229](https://github.com/daltoniam/Starscream/issues/229)
|
||||
[#232](https://github.com/daltoniam/Starscream/issues/232)
|
||||
|
||||
@@ -223,7 +177,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)
|
||||
@@ -232,14 +186,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)
|
||||
@@ -247,7 +201,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"
|
||||
gem "cocoapods", ">= 1.6.0.beta.1"
|
||||
|
||||
+121
-203
@@ -1,283 +1,201 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.6)
|
||||
rexml
|
||||
activesupport (7.0.7)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
algoliasearch (1.27.5)
|
||||
httpclient (~> 2.8, >= 2.8.3)
|
||||
json (>= 1.5.1)
|
||||
artifactory (3.0.15)
|
||||
CFPropertyList (3.0.0)
|
||||
activesupport (4.2.10)
|
||||
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)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.807.0)
|
||||
aws-sdk-core (3.180.3)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.71.0)
|
||||
aws-sdk-core (~> 3, >= 3.177.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.132.1)
|
||||
aws-sdk-core (~> 3, >= 3.179.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.6)
|
||||
aws-sigv4 (1.6.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
claide (1.1.0)
|
||||
cocoapods (1.12.1)
|
||||
addressable (~> 2.8)
|
||||
babosa (1.0.2)
|
||||
claide (1.0.2)
|
||||
cocoapods (1.6.0.beta.1)
|
||||
activesupport (>= 4.0.2, < 5)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.12.1)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.6.0, < 2.0)
|
||||
cocoapods-core (= 1.6.0.beta.1)
|
||||
cocoapods-deintegrate (>= 1.0.2, < 2.0)
|
||||
cocoapods-downloader (>= 1.2.1, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.6.0, < 2.0)
|
||||
cocoapods-stats (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.3.1, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
fourflusher (>= 2.3.0, < 3.0)
|
||||
fourflusher (~> 2.0.1)
|
||||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.8.0)
|
||||
molinillo (~> 0.6.6)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (>= 2.3.0, < 3.0)
|
||||
xcodeproj (>= 1.21.0, < 2.0)
|
||||
cocoapods-core (1.12.1)
|
||||
activesupport (>= 5.0, < 8)
|
||||
addressable (~> 2.8)
|
||||
algoliasearch (~> 1.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
ruby-macho (~> 1.2)
|
||||
xcodeproj (>= 1.6.0, < 2.0)
|
||||
cocoapods-core (1.6.0.beta.1)
|
||||
activesupport (>= 4.0.2, < 6)
|
||||
fuzzy_match (~> 2.0.4)
|
||||
nap (~> 1.0)
|
||||
netrc (~> 0.11)
|
||||
public_suffix (~> 4.0)
|
||||
typhoeus (~> 1.0)
|
||||
cocoapods-deintegrate (1.0.5)
|
||||
cocoapods-downloader (1.6.3)
|
||||
cocoapods-deintegrate (1.0.2)
|
||||
cocoapods-downloader (1.2.1)
|
||||
cocoapods-plugins (1.0.0)
|
||||
nap
|
||||
cocoapods-search (1.0.1)
|
||||
cocoapods-trunk (1.6.0)
|
||||
cocoapods-search (1.0.0)
|
||||
cocoapods-stats (1.0.0)
|
||||
cocoapods-trunk (1.3.1)
|
||||
nap (>= 0.8, < 2.0)
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.2.0)
|
||||
cocoapods-try (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
concurrent-ruby (1.2.2)
|
||||
declarative (0.0.20)
|
||||
digest-crc (0.6.5)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
domain_name (0.5.20190701)
|
||||
commander-fastlane (4.4.6)
|
||||
highline (~> 1.7.2)
|
||||
concurrent-ruby (1.0.5)
|
||||
declarative (0.0.10)
|
||||
declarative-option (0.1.0)
|
||||
domain_name (0.5.20180417)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.8.1)
|
||||
emoji_regex (3.2.3)
|
||||
dotenv (2.5.0)
|
||||
emoji_regex (0.1.1)
|
||||
escape (0.0.4)
|
||||
ethon (0.16.0)
|
||||
ffi (>= 1.15.0)
|
||||
excon (0.100.0)
|
||||
faraday (1.10.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday (>= 0.8.0)
|
||||
excon (0.62.0)
|
||||
faraday (0.15.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-cookie_jar (0.0.6)
|
||||
faraday (>= 0.7.4)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.4)
|
||||
multipart-post (~> 2)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faraday_middleware (1.2.0)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.2.7)
|
||||
fastlane (2.214.0)
|
||||
faraday_middleware (0.12.2)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
fastimage (2.1.4)
|
||||
fastlane (2.105.2)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
aws-sdk-s3 (~> 1.0)
|
||||
babosa (>= 1.0.3, < 2.0.0)
|
||||
bundler (>= 1.12.0, < 3.0.0)
|
||||
addressable (>= 2.3, < 3.0.0)
|
||||
babosa (>= 1.0.2, < 2.0.0)
|
||||
bundler (>= 1.12.0, < 2.0.0)
|
||||
colored
|
||||
commander (~> 4.6)
|
||||
commander-fastlane (>= 4.4.6, < 5.0.0)
|
||||
dotenv (>= 2.1.1, < 3.0.0)
|
||||
emoji_regex (>= 0.1, < 4.0)
|
||||
excon (>= 0.71.0, < 1.0.0)
|
||||
faraday (~> 1.0)
|
||||
emoji_regex (~> 0.1)
|
||||
excon (>= 0.45.0, < 1.0.0)
|
||||
faraday (~> 0.9)
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
faraday_middleware (~> 1.0)
|
||||
faraday_middleware (~> 0.9)
|
||||
fastimage (>= 2.1.0, < 3.0.0)
|
||||
gh_inspector (>= 1.1.2, < 2.0.0)
|
||||
google-apis-androidpublisher_v3 (~> 0.3)
|
||||
google-apis-playcustomapp_v1 (~> 0.1)
|
||||
google-cloud-storage (~> 1.31)
|
||||
highline (~> 2.0)
|
||||
google-api-client (>= 0.21.2, < 0.24.0)
|
||||
highline (>= 1.7.2, < 2.0.0)
|
||||
json (< 3.0.0)
|
||||
jwt (>= 2.1.0, < 3)
|
||||
mini_magick (>= 4.9.4, < 5.0.0)
|
||||
multipart-post (>= 2.0.0, < 3.0.0)
|
||||
naturally (~> 2.2)
|
||||
optparse (~> 0.1.1)
|
||||
mini_magick (~> 4.5.1)
|
||||
multi_json
|
||||
multi_xml (~> 0.5)
|
||||
multipart-post (~> 2.0.0)
|
||||
plist (>= 3.1.0, < 4.0.0)
|
||||
rubyzip (>= 2.0.0, < 3.0.0)
|
||||
public_suffix (~> 2.0.0)
|
||||
rubyzip (>= 1.2.2, < 2.0.0)
|
||||
security (= 0.1.3)
|
||||
simctl (~> 1.6.3)
|
||||
terminal-notifier (>= 2.0.0, < 3.0.0)
|
||||
slack-notifier (>= 2.0.0, < 3.0.0)
|
||||
terminal-notifier (>= 1.6.2, < 2.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.13.0, < 2.0.0)
|
||||
xcodeproj (>= 1.6.0, < 2.0.0)
|
||||
xcpretty (~> 0.3.0)
|
||||
xcpretty-travis-formatter (>= 0.0.3)
|
||||
ffi (1.15.5)
|
||||
fourflusher (2.3.1)
|
||||
fourflusher (2.0.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.48.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-core (0.11.1)
|
||||
google-api-client (0.23.9)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
httpclient (>= 2.8.1, < 3.a)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (>= 0.5, < 0.7.0)
|
||||
httpclient (>= 2.8.1, < 3.0)
|
||||
mime-types (~> 3.0)
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.a)
|
||||
rexml
|
||||
webrick
|
||||
google-apis-iamcredentials_v1 (0.17.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-playcustomapp_v1 (0.13.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-storage_v1 (0.19.0)
|
||||
google-apis-core (>= 0.9.0, < 2.a)
|
||||
google-cloud-core (1.6.0)
|
||||
google-cloud-env (~> 1.0)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-env (1.6.0)
|
||||
faraday (>= 0.17.3, < 3.0)
|
||||
google-cloud-errors (1.3.1)
|
||||
google-cloud-storage (1.44.0)
|
||||
addressable (~> 2.8)
|
||||
digest-crc (~> 0.4)
|
||||
google-apis-iamcredentials_v1 (~> 0.1)
|
||||
google-apis-storage_v1 (~> 0.19.0)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
googleauth (1.7.0)
|
||||
faraday (>= 0.17.3, < 3.a)
|
||||
retriable (>= 2.0, < 4.0)
|
||||
signet (~> 0.9)
|
||||
googleauth (0.6.6)
|
||||
faraday (~> 0.12)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
memoist (~> 0.16)
|
||||
memoist (~> 0.12)
|
||||
multi_json (~> 1.11)
|
||||
os (>= 0.9, < 2.0)
|
||||
signet (>= 0.16, < 2.a)
|
||||
highline (2.0.3)
|
||||
http-cookie (1.0.5)
|
||||
signet (~> 0.7)
|
||||
highline (1.7.10)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.14.1)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jmespath (1.6.2)
|
||||
json (2.6.3)
|
||||
jwt (2.7.1)
|
||||
memoist (0.16.2)
|
||||
mini_magick (4.12.0)
|
||||
mini_mime (1.1.5)
|
||||
minitest (5.19.0)
|
||||
molinillo (0.8.0)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.3.0)
|
||||
nanaimo (0.3.0)
|
||||
json (2.1.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)
|
||||
molinillo (0.6.6)
|
||||
multi_json (1.13.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
nanaimo (0.2.6)
|
||||
nap (1.1.0)
|
||||
naturally (2.2.1)
|
||||
naturally (2.2.0)
|
||||
netrc (0.11.0)
|
||||
optparse (0.1.1)
|
||||
os (1.1.4)
|
||||
plist (3.7.0)
|
||||
public_suffix (4.0.7)
|
||||
rake (13.0.6)
|
||||
representable (3.2.0)
|
||||
os (1.0.0)
|
||||
plist (3.4.0)
|
||||
public_suffix (2.0.5)
|
||||
representable (3.0.4)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
declarative-option (< 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
rexml (3.2.6)
|
||||
rouge (2.0.7)
|
||||
ruby-macho (2.5.1)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.3.2)
|
||||
ruby-macho (1.3.1)
|
||||
rubyzip (1.2.2)
|
||||
security (0.1.3)
|
||||
signet (0.17.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
signet (0.10.0)
|
||||
addressable (~> 2.3)
|
||||
faraday (~> 0.9)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
simctl (1.6.10)
|
||||
simctl (1.6.5)
|
||||
CFPropertyList
|
||||
naturally
|
||||
terminal-notifier (2.0.0)
|
||||
slack-notifier (2.3.2)
|
||||
terminal-notifier (1.8.0)
|
||||
terminal-table (1.8.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
trailblazer-option (0.1.2)
|
||||
tty-cursor (0.7.1)
|
||||
tty-screen (0.8.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
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)
|
||||
thread_safe (~> 0.1)
|
||||
uber (0.1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.2)
|
||||
unicode-display_width (1.8.0)
|
||||
webrick (1.8.1)
|
||||
unf_ext (0.0.7.5)
|
||||
unicode-display_width (1.4.0)
|
||||
word_wrap (1.0.0)
|
||||
xcodeproj (1.22.0)
|
||||
xcodeproj (1.6.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.3.0)
|
||||
rexml (~> 3.2.4)
|
||||
nanaimo (~> 0.2.6)
|
||||
xcpretty (0.3.0)
|
||||
rouge (~> 2.0.7)
|
||||
xcpretty-travis-formatter (1.0.1)
|
||||
xcpretty-travis-formatter (1.0.0)
|
||||
xcpretty (~> 0.2, >= 0.0.7)
|
||||
|
||||
PLATFORMS
|
||||
arm64-darwin-22
|
||||
x86_64-darwin-20
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cocoapods
|
||||
cocoapods (>= 1.6.0.beta.1)
|
||||
fastlane
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.10
|
||||
1.16.1
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
Copyright (c) 2014-2023 Dalton Cherry.
|
||||
Copyright (c) 2014-2016 Dalton Cherry.
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
}
|
||||
+2
-7
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:5.2
|
||||
// swift-tools-version:4.2
|
||||
|
||||
//
|
||||
// Package.Swift
|
||||
@@ -29,11 +29,6 @@ let package = Package(
|
||||
],
|
||||
dependencies: [],
|
||||
targets: [
|
||||
.target(name: "Starscream",
|
||||
path: "Sources")
|
||||
.target(name: "Starscream")
|
||||
]
|
||||
)
|
||||
|
||||
#if os(Linux)
|
||||
package.dependencies.append(.package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0"))
|
||||
#endif
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
|
||||
|
||||
Starscream is a conforming WebSocket ([RFC 6455](https://datatracker.ietf.org/doc/html/rfc6455)) library in Swift.
|
||||
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)
|
||||
|
||||
## Features
|
||||
|
||||
- Conforms to all of the base [Autobahn test suite](https://crossbar.io/autobahn/).
|
||||
- Conforms to all of the base [Autobahn test suite](http://autobahn.ws/testsuite/).
|
||||
- Nonblocking. Everything happens in the background, thanks to GCD.
|
||||
- TLS/WSS support.
|
||||
- Compression Extensions support ([RFC 7692](https://tools.ietf.org/html/rfc7692))
|
||||
- Simple concise codebase at just a few hundred LOC.
|
||||
|
||||
### Import the framework
|
||||
## Example
|
||||
|
||||
First thing is to import the framework. See the Installation instructions on how to add the framework to your project.
|
||||
|
||||
@@ -17,67 +20,94 @@ 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
|
||||
var request = URLRequest(url: URL(string: "http://localhost:8080")!)
|
||||
request.timeoutInterval = 5
|
||||
socket = WebSocket(request: request)
|
||||
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
|
||||
socket.delegate = self
|
||||
socket.connect()
|
||||
```
|
||||
|
||||
After you are connected, there is either a delegate or closure you can use for process WebSocket events.
|
||||
After you are connected, there are some delegate methods that we need to implement.
|
||||
|
||||
### Receiving data from a WebSocket
|
||||
### websocketDidConnect
|
||||
|
||||
`didReceive` receives all the WebSocket events in a single easy to handle enum.
|
||||
websocketDidConnect is called as soon as the client connects to the server.
|
||||
|
||||
```swift
|
||||
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)
|
||||
case .peerClosed:
|
||||
break
|
||||
}
|
||||
func websocketDidConnect(socket: WebSocketClient) {
|
||||
print("websocket is connected")
|
||||
}
|
||||
```
|
||||
|
||||
The closure of this would be:
|
||||
### websocketDidDisconnect
|
||||
|
||||
websocketDidDisconnect is called as soon as the client is disconnected from the server.
|
||||
|
||||
```swift
|
||||
socket.onEvent = { event in
|
||||
switch event {
|
||||
// handle events just like above...
|
||||
}
|
||||
func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
|
||||
print("websocket is disconnected: \(error?.localizedDescription)")
|
||||
}
|
||||
```
|
||||
|
||||
### Writing to a WebSocket
|
||||
### 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?
|
||||
|
||||
### write a binary frame
|
||||
|
||||
@@ -130,49 +160,98 @@ The disconnect method does what you would expect and closes the socket.
|
||||
socket.disconnect()
|
||||
```
|
||||
|
||||
The disconnect method can also send a custom close code if desired.
|
||||
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.
|
||||
|
||||
```swift
|
||||
socket.disconnect(closeCode: CloseCode.normal.rawValue)
|
||||
socket.disconnect(forceTimeout: 10, closeCode: CloseCode.normal.rawValue)
|
||||
```
|
||||
|
||||
### Custom Headers, Protocols and Timeout
|
||||
### isConnected
|
||||
|
||||
You can override the default websocket headers, add your own custom ones and set a 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:
|
||||
|
||||
```swift
|
||||
var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
|
||||
request.timeoutInterval = 5 // Sets the timeout for the connection
|
||||
request.timeoutInterval = 5
|
||||
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.
|
||||
|
||||
Allow Self-signed certificates:
|
||||
### SSL Cipher Suites
|
||||
|
||||
To use an SSL encrypted connection, you need to tell Starscream about the cipher suites your server supports.
|
||||
|
||||
```swift
|
||||
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)
|
||||
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]
|
||||
```
|
||||
|
||||
TODO: Update docs on how to load certificates and public keys into an app bundle, use the builtin pinner and TrustKit.
|
||||
If you don't know which cipher suites are supported by your server, you can try pointing [SSL Labs](https://www.ssllabs.com/ssltest/) at it and checking the results.
|
||||
|
||||
### Compression Extensions
|
||||
|
||||
Compression Extensions ([RFC 7692](https://tools.ietf.org/html/rfc7692)) is supported in Starscream. Compression is enabled by default, however compression will only be used if it is supported by the server as well. You may enable compression by adding a `compressionHandler`:
|
||||
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
|
||||
var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
|
||||
let compression = WSCompression()
|
||||
let socket = WebSocket(request: request, compressionHandler: compression)
|
||||
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
|
||||
socket.enableCompression = false
|
||||
```
|
||||
|
||||
Compression should be disabled if your application is transmitting already-compressed, random, or other uncompressable data.
|
||||
@@ -193,7 +272,7 @@ Check out the SimpleTest project in the examples directory to see how to setup a
|
||||
|
||||
## Requirements
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -204,10 +283,10 @@ Check out [Get Started](http://cocoapods.org/) tab on [cocoapods.org](http://coc
|
||||
To use Starscream in your project add the following 'Podfile' to your project
|
||||
|
||||
source 'https://github.com/CocoaPods/Specs.git'
|
||||
platform :ios, '11.0'
|
||||
platform :ios, '9.0'
|
||||
use_frameworks!
|
||||
|
||||
pod 'Starscream', '~> 4.0.6'
|
||||
pod 'Starscream', '~> 3.0.2'
|
||||
|
||||
Then run:
|
||||
|
||||
@@ -229,32 +308,9 @@ $ brew install carthage
|
||||
To integrate Starscream into your Xcode project using Carthage, specify it in your `Cartfile`:
|
||||
|
||||
```
|
||||
github "daltoniam/Starscream" >= 4.0.6
|
||||
github "daltoniam/Starscream" >= 3.0.2
|
||||
```
|
||||
|
||||
### 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.6")),
|
||||
```
|
||||
|
||||
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.
|
||||
@@ -275,7 +331,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", from: "4.0.0")
|
||||
.Package(url: "https://github.com/daltoniam/Starscream.git", majorVersion: 3)
|
||||
]
|
||||
```
|
||||
|
||||
@@ -289,12 +345,54 @@ Add the `Starscream.xcodeproj` to your Xcode project. Once that is complete, in
|
||||
|
||||
If you are running this in an OSX app or on a physical iOS device you will need to make sure you add the `Starscream.framework` to be included in your app bundle. To do this, in Xcode, navigate to the target configuration window by clicking on the blue project icon, and selecting the application target under the "Targets" heading in the sidebar. In the tab bar at the top of that window, open the "Build Phases" panel. Expand the "Link Binary with Libraries" group, and add `Starscream.framework`. Click on the + button at the top left of the panel and select "New Copy Files Phase". Rename this new phase to "Copy Frameworks", set the "Destination" to "Frameworks", and add `Starscream.framework` respectively.
|
||||
|
||||
|
||||
## WebSocketAdvancedDelegate
|
||||
The advanced delegate acts just like the simpler delegate but provides some additional information on the connection and incoming frames.
|
||||
|
||||
```swift
|
||||
socket.advancedDelegate = self
|
||||
```
|
||||
|
||||
In most cases you do not need the extra info and should use the normal delegate.
|
||||
|
||||
#### websocketDidReceiveMessage
|
||||
```swift
|
||||
func websocketDidReceiveMessage(socket: WebSocketClient, text: String, response: WebSocket.WSResponse) {
|
||||
print("got some text: \(text)")
|
||||
print("First frame for this message arrived on \(response.firstFrame)")
|
||||
}
|
||||
```
|
||||
|
||||
#### websocketDidReceiveData
|
||||
```swift
|
||||
func websocketDidReceiveData(socket: WebSocketClient, data: Date, response: WebSocket.WSResponse) {
|
||||
print("got some data it long: \(data.count)")
|
||||
print("A total of \(response.frameCount) frames were used to send this data")
|
||||
}
|
||||
```
|
||||
|
||||
#### websocketHttpUpgrade
|
||||
These methods are called when the HTTP upgrade request is sent and when the response returns.
|
||||
```swift
|
||||
func websocketHttpUpgrade(socket: WebSocketClient, request: CFHTTPMessage) {
|
||||
print("the http request was sent we can check the raw http if we need to")
|
||||
}
|
||||
```
|
||||
|
||||
```swift
|
||||
func websocketHttpUpgrade(socket: WebSocketClient, response: CFHTTPMessage) {
|
||||
print("the http response has returned.")
|
||||
}
|
||||
```
|
||||
|
||||
## KNOWN ISSUES
|
||||
- WatchOS does not have the the CFNetwork String constants to modify the stream's SSL behavior. It will be the default Foundation SSL behavior. This means watchOS CANNOT use `SSLCiphers`, `disableSSLCertValidation`, or SSL pinning. All these values set on watchOS will do nothing.
|
||||
- Linux does not have the security framework, so it CANNOT use SSL pinning or `SSLCiphers` either.
|
||||
|
||||
|
||||
## TODOs
|
||||
|
||||
- [ ] Proxy support
|
||||
- [ ] Thread safe implementation
|
||||
- [ ] Better testing/CI
|
||||
- [ ] SSL Pinning/client auth examples
|
||||
- [ ] Add Unit Tests - Local WebSocket server that runs against Autobahn
|
||||
|
||||
## License
|
||||
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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,53 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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 {}
|
||||
|
||||
#if swift(>=5.0)
|
||||
func withUnsafeBytes<ResultType, ContentType>(_ completion: (UnsafePointer<ContentType>) throws -> ResultType) rethrows -> ResultType {
|
||||
return try withUnsafeBytes {
|
||||
if let baseAddress = $0.baseAddress, $0.count > 0 {
|
||||
return try completion(baseAddress.assumingMemoryBound(to: ContentType.self))
|
||||
} else {
|
||||
throw ByteError()
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if swift(>=5.0)
|
||||
mutating func withUnsafeMutableBytes<ResultType, ContentType>(_ completion: (UnsafeMutablePointer<ContentType>) throws -> ResultType) rethrows -> ResultType {
|
||||
return try withUnsafeMutableBytes {
|
||||
if let baseAddress = $0.baseAddress, $0.count > 0 {
|
||||
return try completion(baseAddress.assumingMemoryBound(to: ContentType.self))
|
||||
} else {
|
||||
throw ByteError()
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Engine.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 6/15/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 EngineDelegate: AnyObject {
|
||||
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: (() -> ())?)
|
||||
}
|
||||
@@ -1,115 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// NativeEngine.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 6/15/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
|
||||
|
||||
@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))
|
||||
return
|
||||
}
|
||||
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)))
|
||||
}
|
||||
|
||||
public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
|
||||
broadcast(event: .error(error))
|
||||
}
|
||||
}
|
||||
@@ -1,265 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// WSEngine.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 6/15/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 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
|
||||
private var isConnecting = 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 isConnecting = self.isConnecting
|
||||
let isConnected = canSend
|
||||
mutex.signal()
|
||||
if isConnecting || 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
|
||||
}
|
||||
mutex.wait()
|
||||
self.isConnecting = true
|
||||
mutex.signal()
|
||||
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() {
|
||||
mutex.wait()
|
||||
isConnecting = false
|
||||
mutex.signal()
|
||||
|
||||
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:
|
||||
mutex.wait()
|
||||
isConnecting = false
|
||||
mutex.signal()
|
||||
|
||||
broadcast(event: .cancelled)
|
||||
case .peerClosed:
|
||||
broadcast(event: .peerClosed)
|
||||
}
|
||||
}
|
||||
|
||||
// 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()
|
||||
isConnecting = false
|
||||
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()
|
||||
isConnecting = false
|
||||
canSend = false
|
||||
didUpgrade = false
|
||||
mutex.signal()
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
let code = CFHTTPMessageGetResponseStatusCode(response)
|
||||
if code != HTTPWSHeader.switchProtocolCode {
|
||||
delegate?.didReceiveHTTP(event: .failure(HTTPUpgradeError.notAnUpgrade(code, headers)))
|
||||
return true
|
||||
}
|
||||
|
||||
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
|
||||
@@ -1,99 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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 as NSString) != 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
|
||||
}
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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: AnyObject {
|
||||
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 frame.isFin {
|
||||
if isText {
|
||||
if let string = String(data: buffer, encoding: .utf8) {
|
||||
delegate?.didForm(event: .text(string))
|
||||
} else {
|
||||
let errCode = CloseCode.protocolError.rawValue
|
||||
delegate?.didForm(event: .error(WSError(type: .protocolError, message: "not valid UTF-8 data", code: errCode)))
|
||||
}
|
||||
} else {
|
||||
delegate?.didForm(event: .binary(buffer))
|
||||
}
|
||||
reset()
|
||||
}
|
||||
}
|
||||
|
||||
func reset() {
|
||||
buffer = Data()
|
||||
frameCount = 0
|
||||
}
|
||||
}
|
||||
@@ -1,365 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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: AnyObject {
|
||||
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 || opcode == .pong)
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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, [String: String])
|
||||
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 req.allHTTPHeaderFields?["Cookie"] == nil {
|
||||
if let cookies = HTTPCookieStorage.shared.cookies(for: url), !cookies.isEmpty {
|
||||
let headers = HTTPCookie.requestHeaderFields(with: cookies)
|
||||
for (key, val) in headers {
|
||||
req.setValue(val, forHTTPHeaderField: key)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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: AnyObject {
|
||||
func didReceiveHTTP(event: HTTPEvent)
|
||||
}
|
||||
|
||||
public protocol HTTPHandler {
|
||||
func register(delegate: HTTPHandlerDelegate)
|
||||
func convert(request: URLRequest) -> Data
|
||||
func parse(data: Data) -> Int
|
||||
}
|
||||
|
||||
public protocol HTTPServerDelegate: AnyObject {
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -1,143 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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, headers)))
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>$(MARKETING_VERSION)</string>
|
||||
<string>3.0.5</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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
|
||||
}
|
||||
|
||||
SecTrustSetPolicies(trust, SecPolicyCreateSSL(true, domain 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()
|
||||
}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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: AnyObject {
|
||||
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: AnyObject {
|
||||
func validate(headers: [String: String], key: String) -> Error?
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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: AnyObject {
|
||||
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?
|
||||
}
|
||||
|
||||
|
||||
@@ -1,198 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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)
|
||||
case .peerClosed:
|
||||
delegate?.didReceive(event: .disconnected(self, "Connection closed by peer", UInt16(FrameOpCode.connectionClose.rawValue)))
|
||||
}
|
||||
}
|
||||
|
||||
/// 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
|
||||
+3
-15
@@ -1,24 +1,10 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Starscream.h
|
||||
// Starscream
|
||||
//
|
||||
// Created by Austin Cherry on 9/25/14.
|
||||
// Copyright © 2014 Vluxe. All rights reserved.
|
||||
// Copyright (c) 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 <Foundation/Foundation.h>
|
||||
|
||||
@@ -29,3 +15,5 @@ FOUNDATION_EXPORT double StarscreamVersionNumber;
|
||||
FOUNDATION_EXPORT const unsigned char StarscreamVersionString[];
|
||||
|
||||
// In this header, you should import all the public headers of your framework using statements like #import <Starscream/PublicHeader.h>
|
||||
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// WSCompression.swift
|
||||
// Compression.swift
|
||||
//
|
||||
// Created by Joseph Ross on 7/16/14.
|
||||
// Copyright © 2017 Joseph Ross & Vluxe. All rights reserved.
|
||||
// Copyright © 2017 Joseph Ross.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
@@ -29,85 +29,13 @@
|
||||
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
|
||||
|
||||
// assume defaults unless the headers say otherwise
|
||||
compressor = Compressor(windowBits: 15)
|
||||
decompressor = Decompressor(windowBits: 15)
|
||||
|
||||
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 }
|
||||
}
|
||||
@@ -128,7 +56,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)
|
||||
}
|
||||
}
|
||||
@@ -143,20 +71,19 @@ 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)
|
||||
|
||||
repeat {
|
||||
buffer.withUnsafeMutableBytes { (bufferPtr) in
|
||||
strm.next_out = bufferPtr.bindMemory(to: UInt8.self).baseAddress
|
||||
strm.avail_out = CUnsignedInt(bufferPtr.count)
|
||||
strm.next_out = UnsafeMutablePointer<UInt8>(&buffer)
|
||||
strm.avail_out = CUnsignedInt(buffer.count)
|
||||
|
||||
res = inflate(&strm, 0)
|
||||
}
|
||||
res = inflate(&strm, 0)
|
||||
|
||||
let byteCount = buffer.count - Int(strm.avail_out)
|
||||
out.append(buffer, count: byteCount)
|
||||
@@ -184,7 +111,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
|
||||
@@ -208,24 +135,17 @@ class Compressor {
|
||||
}
|
||||
|
||||
func compress(_ data: Data) throws -> Data {
|
||||
guard !data.isEmpty else {
|
||||
// For example, PONG has no content
|
||||
return 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)
|
||||
|
||||
repeat {
|
||||
buffer.withUnsafeMutableBytes { (bufferPtr) in
|
||||
strm.next_out = bufferPtr.bindMemory(to: UInt8.self).baseAddress
|
||||
strm.avail_out = CUnsignedInt(bufferPtr.count)
|
||||
strm.next_out = UnsafeMutablePointer<UInt8>(&buffer)
|
||||
strm.avail_out = CUnsignedInt(buffer.count)
|
||||
|
||||
res = deflate(&strm, Z_SYNC_FLUSH)
|
||||
}
|
||||
res = deflate(&strm, Z_SYNC_FLUSH)
|
||||
|
||||
let byteCount = buffer.count - Int(strm.avail_out)
|
||||
compressed.append(buffer, count: byteCount)
|
||||
@@ -254,3 +174,4 @@ class Compressor {
|
||||
teardownDeflate()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// FoundationStream.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 7/23/18.
|
||||
// Copyright (c) 2014-2018 Dalton Cherry.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
import Foundation
|
||||
|
||||
///
|
||||
open class FoundationStream: NSObject, WSStream, StreamDelegate {
|
||||
private static let sharedWorkQueue = DispatchQueue(label: "com.vluxe.starscream.foundationstream", attributes: [])
|
||||
private var inputStream: InputStream?
|
||||
private var outputStream: OutputStream?
|
||||
private let security: FoundationSecurity
|
||||
public weak var delegate: WSStreamDelegate?
|
||||
let BUFFER_MAX = 4096
|
||||
var isConnected = false
|
||||
|
||||
public var enableSOCKSProxy = false
|
||||
|
||||
public init(security: FoundationSecurity = FoundationSecurity()) {
|
||||
self.security = security
|
||||
}
|
||||
|
||||
public func connect(url: URL, port: Int, timeout: TimeInterval, useSSL: Bool, completion: @escaping ((Error?) -> Void)) {
|
||||
var readStream: Unmanaged<CFReadStream>?
|
||||
var writeStream: Unmanaged<CFWriteStream>?
|
||||
let h = url.host! as NSString
|
||||
CFStreamCreatePairWithSocketToHost(nil, h, UInt32(port), &readStream, &writeStream)
|
||||
inputStream = readStream!.takeRetainedValue()
|
||||
outputStream = writeStream!.takeRetainedValue()
|
||||
|
||||
#if os(watchOS) //watchOS is unfortunately missing the kCFStream properties to make this work
|
||||
#else
|
||||
if enableSOCKSProxy {
|
||||
let proxyDict = CFNetworkCopySystemProxySettings()
|
||||
let socksConfig = CFDictionaryCreateMutableCopy(nil, 0, proxyDict!.takeRetainedValue())
|
||||
let propertyKey = CFStreamPropertyKey(rawValue: kCFStreamPropertySOCKSProxy)
|
||||
CFWriteStreamSetProperty(outputStream, propertyKey, socksConfig)
|
||||
CFReadStreamSetProperty(inputStream, propertyKey, socksConfig)
|
||||
}
|
||||
#endif
|
||||
|
||||
guard let inStream = inputStream, let outStream = outputStream else { return }
|
||||
inStream.delegate = self
|
||||
outStream.delegate = self
|
||||
|
||||
if useSSL, let error = security.configure(inputStream: inStream, outputStream: outStream) {
|
||||
completion(error)
|
||||
return
|
||||
}
|
||||
|
||||
CFReadStreamSetDispatchQueue(inStream, FoundationStream.sharedWorkQueue)
|
||||
CFWriteStreamSetDispatchQueue(outStream, FoundationStream.sharedWorkQueue)
|
||||
inStream.open()
|
||||
outStream.open()
|
||||
isConnected = true
|
||||
|
||||
var out = timeout// wait X seconds before giving up
|
||||
FoundationStream.sharedWorkQueue.async { [weak self] in
|
||||
while !outStream.hasSpaceAvailable {
|
||||
usleep(100) // wait until the socket is ready
|
||||
out -= 100
|
||||
if out < 0 {
|
||||
completion(WSError(type: .writeTimeoutError, message: "Timed out waiting for the socket to be ready for a write", code: 0))
|
||||
return
|
||||
} else if let error = outStream.streamError {
|
||||
completion(error)
|
||||
return // disconnectStream will be called.
|
||||
} else if self == nil {
|
||||
completion(WSError(type: .closeError, message: "socket object has been dereferenced", code: 0))
|
||||
return
|
||||
}
|
||||
}
|
||||
completion(nil) //success!
|
||||
}
|
||||
}
|
||||
|
||||
public func write(data: Data, completion: @escaping ((Error?) -> Void)) {
|
||||
guard isConnected else {return} //don't write to a dead socket
|
||||
var written = 0
|
||||
let total = data.count
|
||||
while written < total {
|
||||
guard let outStream = outputStream else {
|
||||
completion(WSError(type: .outputStreamWriteError, message: "output stream had an error during write", code: 0))
|
||||
return
|
||||
}
|
||||
data.withUnsafeBytes { (pointer: UnsafePointer<UInt8>) in
|
||||
guard let buffer = UnsafeBufferPointer(start: pointer, count: total).fromOffset(written).baseAddress else {
|
||||
completion(WSError(type: .outputStreamWriteError, message: "buffer error during write", code: 0))
|
||||
return
|
||||
}
|
||||
written += outStream.write(buffer, maxLength: total - written)
|
||||
if written < 0 {
|
||||
completion(WSError(type: .outputStreamWriteError, message: "buffer error during write", code: 0))
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
completion(nil)
|
||||
}
|
||||
|
||||
/// read data from the stream.
|
||||
public func read() -> Data? {
|
||||
guard let stream = inputStream else {return nil}
|
||||
let buf = NSMutableData(capacity: BUFFER_MAX)
|
||||
let buffer = UnsafeMutableRawPointer(mutating: buf!.bytes).assumingMemoryBound(to: UInt8.self)
|
||||
let length = stream.read(buffer, maxLength: BUFFER_MAX)
|
||||
if length < 1 {
|
||||
return nil
|
||||
}
|
||||
return Data(bytes: buffer, count: length)
|
||||
}
|
||||
|
||||
public func cleanup() {
|
||||
isConnected = false
|
||||
if let stream = inputStream {
|
||||
stream.delegate = nil
|
||||
CFReadStreamSetDispatchQueue(stream, nil)
|
||||
stream.close()
|
||||
}
|
||||
if let stream = outputStream {
|
||||
stream.delegate = nil
|
||||
CFWriteStreamSetDispatchQueue(stream, nil)
|
||||
stream.close()
|
||||
}
|
||||
outputStream = nil
|
||||
inputStream = nil
|
||||
}
|
||||
|
||||
public func isValidSSLCertificate() -> Bool {
|
||||
guard let outputStream = outputStream else {return false} //the stream is already invalid
|
||||
return security.checkTrust(outputStream: outputStream)
|
||||
}
|
||||
|
||||
/// MARK: - StreamDelegate
|
||||
open func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
|
||||
if eventCode == .hasBytesAvailable {
|
||||
if aStream == inputStream {
|
||||
delegate?.newBytesInStream()
|
||||
}
|
||||
} else if eventCode == .errorOccurred {
|
||||
delegate?.streamDidError(error: aStream.streamError)
|
||||
} else if eventCode == .endEncountered {
|
||||
delegate?.streamDidError(error: nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// NetworkStream.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 7/23/18.
|
||||
// Copyright (c) 2014-2018 Dalton Cherry.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
import Foundation
|
||||
#if canImport(Network)
|
||||
import Network
|
||||
#endif
|
||||
|
||||
/// Implementation of the Network framework that was introduced in iOS 12/MacOS 10.14.
|
||||
/// This class will probably replace the Foundation one in the future, but because Foundation is battle-tested
|
||||
/// it will continue to be provided for backwards compatibility reasons.
|
||||
@available(iOS 12.0, *)
|
||||
@available(iOSApplicationExtension 12.0, tvOSApplicationExtension 12.0, OSXApplicationExtension 10.14, *)
|
||||
open class NetworkStream: WSStream {
|
||||
public weak var delegate: WSStreamDelegate?
|
||||
private var stream: NWConnection?
|
||||
private static let sharedWorkQueue = DispatchQueue(label: "com.vluxe.starscream.networkstream", attributes: [])
|
||||
private var readQueue = [Data]()
|
||||
var running = false
|
||||
var connected = false
|
||||
|
||||
//need security stuff
|
||||
public init() {
|
||||
|
||||
}
|
||||
|
||||
/// connect to the websocket server and start the read loop
|
||||
public func connect(url: URL, port: Int, timeout: TimeInterval, useSSL: Bool, completion: @escaping ((Error?) -> Void)) {
|
||||
let parameters: NWParameters = useSSL ? .tls : .tcp
|
||||
let conn = NWConnection(host: NWEndpoint.Host.name(url.host!, nil), port: NWEndpoint.Port(rawValue: UInt16(port))!, using: parameters)
|
||||
connected = false
|
||||
func doConnect(_ error: Error?) {
|
||||
if !connected {
|
||||
completion(error)
|
||||
connected = true
|
||||
running = true
|
||||
} else {
|
||||
running = false
|
||||
}
|
||||
}
|
||||
conn.stateUpdateHandler = { [weak self] (newState) in
|
||||
switch newState {
|
||||
case .ready:
|
||||
doConnect(nil)
|
||||
case .waiting:
|
||||
self?.delegate?.streamIsWaitingForConnectivity()
|
||||
case .cancelled:
|
||||
doConnect(nil)
|
||||
case .failed(let error):
|
||||
doConnect(error)
|
||||
self?.delegate?.streamDidError(error: error)
|
||||
case .setup, .preparing:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
conn.viabilityUpdateHandler = { [weak self] (isViable) in
|
||||
self?.delegate?.streamPathViabilityUpdate(isViable: isViable)
|
||||
}
|
||||
|
||||
conn.betterPathUpdateHandler = { [weak self] (isBetter) in
|
||||
self?.delegate?.streamBetterPathUpdate(isBetter: isBetter)
|
||||
}
|
||||
|
||||
conn.start(queue: NetworkStream.sharedWorkQueue)
|
||||
stream = conn
|
||||
running = true
|
||||
readLoop()
|
||||
}
|
||||
|
||||
/// Write data over the socket to the websocket server
|
||||
/// From how I understand the documentation for send, we might need to optimize with queued writes.
|
||||
public func write(data: Data, completion: @escaping ((Error?) -> Void)) {
|
||||
stream?.send(content: data, completion: .contentProcessed { (sendError) in
|
||||
completion(nil) //sendError
|
||||
})
|
||||
}
|
||||
|
||||
/// get hte latest message from the read queue
|
||||
public func read() -> Data? {
|
||||
return readQueue.removeFirst()
|
||||
}
|
||||
|
||||
/// stream isn't to be used anymore
|
||||
public func cleanup() {
|
||||
running = false
|
||||
stream?.cancel()
|
||||
}
|
||||
|
||||
public func isValidSSLCertificate() -> Bool {
|
||||
return false //TODO: SSL pinning for the network framework
|
||||
}
|
||||
|
||||
//continually read from the stream waiting for more content to process
|
||||
func readLoop() {
|
||||
if !running {
|
||||
return
|
||||
}
|
||||
stream?.receive(minimumIncompleteLength: 2, maximumLength: 4096, completion: {[weak self] (data, context, isComplete, error) in
|
||||
guard let s = self else {return}
|
||||
if let err = error {
|
||||
s.delegate?.streamDidError(error: err)
|
||||
return
|
||||
}
|
||||
if let data = data {
|
||||
s.readQueue.append(data)
|
||||
s.delegate?.newBytesInStream()
|
||||
}
|
||||
// I'm not sure why this is needed (might be a bug),
|
||||
// but this indicates the stream is "dead" and should be closed
|
||||
// even though we never got that state update
|
||||
if isComplete && data == nil, context == nil, error == nil {
|
||||
s.delegate?.streamDidError(error: nil)
|
||||
s.cleanup()
|
||||
return
|
||||
}
|
||||
s.readLoop()
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
//
|
||||
// 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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,373 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// SSLSecurity.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 5/16/15.
|
||||
// Copyright (c) 2014-2018 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 FoundationSSLValidator {
|
||||
func checkTrust(outputStream: OutputStream) -> Bool
|
||||
func configure(inputStream: InputStream, outputStream: OutputStream) -> WSError?
|
||||
}
|
||||
|
||||
open class FoundationSecurity: FoundationSSLValidator {
|
||||
public var pinner: SSLPinnerTrustValidator?
|
||||
public var desiredTrustHostname: String?
|
||||
public var disableCertValidation: Bool
|
||||
public var disableSSL = false
|
||||
public var overrideTrustHostname = false
|
||||
public var cipherSuites: [SSLCipherSuite]?
|
||||
public var clientCertificate: SSLClientCertificate?
|
||||
|
||||
/**
|
||||
Designated init for FoundationSecurity
|
||||
|
||||
- parameter sslPinner: is SSL pinning class you want to use
|
||||
- parameter desiredTrustHostname: is SSL hostname you want to validate
|
||||
- parameter disableCertValidation: is to disable the SSL certificate chain validation
|
||||
- parameter clientCertificate: is to configure client side authentication
|
||||
|
||||
- returns: a security object that is used with the FoundationStream
|
||||
*/
|
||||
public init(pinner: SSLPinnerTrustValidator? = nil, desiredTrustHostname: String? = nil, disableCertValidation: Bool = false, clientCertificate: SSLClientCertificate? = nil) {
|
||||
self.pinner = pinner
|
||||
self.desiredTrustHostname = desiredTrustHostname
|
||||
self.disableCertValidation = disableCertValidation
|
||||
self.self.clientCertificate = clientCertificate
|
||||
if desiredTrustHostname != nil {
|
||||
self.overrideTrustHostname = true
|
||||
}
|
||||
}
|
||||
|
||||
public func configure(inputStream: InputStream, outputStream: OutputStream) -> WSError? {
|
||||
if disableSSL {
|
||||
return nil
|
||||
}
|
||||
inputStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL as AnyObject, forKey: Stream.PropertyKey.socketSecurityLevelKey)
|
||||
outputStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL as AnyObject, forKey: Stream.PropertyKey.socketSecurityLevelKey)
|
||||
#if os(watchOS) //watchOS is unfortunately missing the kCFStream properties to make this work
|
||||
#else
|
||||
var settings = [NSObject: NSObject]()
|
||||
if disableCertValidation {
|
||||
settings[kCFStreamSSLValidatesCertificateChain] = NSNumber(value: false)
|
||||
}
|
||||
if let hostname = desiredTrustHostname {
|
||||
settings[kCFStreamSSLPeerName] = hostname as NSString
|
||||
} else if overrideTrustHostname {
|
||||
settings[kCFStreamSSLPeerName] = kCFNull
|
||||
}
|
||||
if let clientCertificate = clientCertificate {
|
||||
settings[kCFStreamSSLCertificates] = clientCertificate.streamSSLCertificates
|
||||
}
|
||||
|
||||
inputStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey)
|
||||
outputStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey)
|
||||
#endif
|
||||
|
||||
if let cipherSuites = cipherSuites {
|
||||
#if os(watchOS) //watchOS is unfortunately missing the kCFStream properties to make this work
|
||||
#else
|
||||
if let sslContextIn = CFReadStreamCopyProperty(inputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext?,
|
||||
let sslContextOut = CFWriteStreamCopyProperty(outputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext? {
|
||||
let resIn = SSLSetEnabledCiphers(sslContextIn, cipherSuites, cipherSuites.count)
|
||||
let resOut = SSLSetEnabledCiphers(sslContextOut, cipherSuites, cipherSuites.count)
|
||||
if resIn != errSecSuccess {
|
||||
return WSError(type: .invalidSSLError, message: "Error setting incoming cypher suites", code: UInt16(resIn))
|
||||
} else if resOut != errSecSuccess {
|
||||
return WSError(type: .invalidSSLError, message: "Error setting outgoing cypher suites", code: UInt16(resOut))
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
public func checkTrust(outputStream: OutputStream) -> Bool {
|
||||
#if os(watchOS) //watchOS is unfortunately missing the kCFStream properties to make this work
|
||||
return true
|
||||
#else
|
||||
guard let pinner = pinner else {return true} //true because we don't validated.
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
guard let t = trust else {return true} //true because this probably isn't and SSL stream without a trust.
|
||||
return pinner.isValid(t, domain: domain)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// SSLPinnerTrustValidator is the base protocol needed to do SSL pinning on the FoundationStream.
|
||||
public protocol SSLPinnerTrustValidator {
|
||||
func isValid(_ trust: SecTrust, domain: String?) -> Bool
|
||||
}
|
||||
|
||||
|
||||
/// SSLCert the object to hold and use an SSL key or certificate.
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
/// FoundationPinner is a very simple SSL pinning implementation.
|
||||
/// Also See TrustKit...more words.
|
||||
open class FoundationPinner : SSLPinnerTrustValidator {
|
||||
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,538 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// WSMessageParser.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 7/25/18.
|
||||
// Copyright (c) 2014-2018 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.
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
|
||||
// Processes and converts raw data into websocket frames
|
||||
// The messages
|
||||
|
||||
import Foundation
|
||||
import CommonCrypto
|
||||
|
||||
struct WSMessage {
|
||||
let code: WebSocket.OpCode
|
||||
let data: Data
|
||||
}
|
||||
|
||||
struct WSFrame {
|
||||
let code: WebSocket.OpCode
|
||||
let bytesLeft: Int
|
||||
let data: Data
|
||||
}
|
||||
|
||||
protocol WSMessageParserDelegate: class {
|
||||
func didReceive(message: WSMessage)
|
||||
func didEncounter(error: WSError)
|
||||
func didParseHTTP(response: String)
|
||||
}
|
||||
|
||||
protocol WSMessageParserClient {
|
||||
func append(data: Data)
|
||||
func createSendFrame(data: Data, code: WebSocket.OpCode) -> Data
|
||||
func reset()
|
||||
}
|
||||
|
||||
class WSMessageParser: WSMessageParserClient {
|
||||
public weak var delegate: WSMessageParserDelegate?
|
||||
public var headerSecurityKey: String {
|
||||
return headerSecKey
|
||||
}
|
||||
|
||||
struct CompressionState {
|
||||
var supportsCompression = false
|
||||
var messageNeedsDecompression = false
|
||||
var serverMaxWindowBits = 15
|
||||
var clientMaxWindowBits = 15
|
||||
var clientNoContextTakeover = false
|
||||
var serverNoContextTakeover = false
|
||||
var decompressor: Decompressor? = nil
|
||||
var compressor: Compressor? = nil
|
||||
}
|
||||
|
||||
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 httpSwitchProtocolCode = 101
|
||||
let MaxFrameSize: Int = 32
|
||||
|
||||
private var inputQueue = [Data]()
|
||||
private var fragBuffer: Data?
|
||||
private let queue = DispatchQueue(label: "com.vluxe.starscream.messages", attributes: [])
|
||||
private var readStack = [WSFrame]()
|
||||
private let emptyBuffer = UnsafeBufferPointer<UInt8>(start: nil, count: 0)
|
||||
private var didHandshake = false
|
||||
private var compressionState = CompressionState()
|
||||
private var headerSecKey = WSMessageParser.generateWebSocketKey()
|
||||
private let frameHeaderLength = MemoryLayout<UInt8>.size * 2
|
||||
|
||||
// add the data to the queue to be processed
|
||||
func append(data: Data) {
|
||||
queue.async { [weak self] in
|
||||
guard let self = self else { return }
|
||||
let process = self.inputQueue.count == 0
|
||||
self.inputQueue.append(data)
|
||||
if process {
|
||||
self.dequeue()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// creates a websocket frame out of the data you wish to send to the WebSocket server
|
||||
func createSendFrame(data: Data, code: WebSocket.OpCode) -> Data {
|
||||
var offset = frameHeaderLength
|
||||
var firstByte: UInt8 = FinMask | code.rawValue
|
||||
var data = data
|
||||
if [.text, .binary].contains(code), let compressor = compressionState.compressor {
|
||||
do {
|
||||
data = try compressor.compress(data)
|
||||
if compressionState.clientNoContextTakeover {
|
||||
try compressor.reset()
|
||||
}
|
||||
firstByte |= RSV1Mask
|
||||
} catch {
|
||||
//report error? We can just send the uncompressed frame.
|
||||
}
|
||||
}
|
||||
let dataLength = data.count
|
||||
var dataBuffer = Data(capacity: dataLength + MaxFrameSize)
|
||||
|
||||
let frame = dataBuffer.withUnsafeMutableBytes { (buffer: UnsafeMutablePointer<UInt8>) -> Data in
|
||||
buffer[0] = firstByte
|
||||
if dataLength < 126 {
|
||||
buffer[1] = CUnsignedChar(dataLength)
|
||||
} else if dataLength <= Int(UInt16.max) {
|
||||
buffer[1] = 126
|
||||
WSMessageParser.writeUint16(buffer, offset: offset, value: UInt16(dataLength))
|
||||
offset += MemoryLayout<UInt16>.size
|
||||
} else {
|
||||
buffer[1] = 127
|
||||
WSMessageParser.writeUint64(buffer, offset: offset, value: UInt64(dataLength))
|
||||
offset += MemoryLayout<UInt64>.size
|
||||
}
|
||||
buffer[1] |= MaskMask
|
||||
let maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
|
||||
_ = SecRandomCopyBytes(kSecRandomDefault, Int(MemoryLayout<UInt32>.size), maskKey)
|
||||
offset += MemoryLayout<UInt32>.size
|
||||
|
||||
for i in 0..<dataLength {
|
||||
buffer[offset] = data[i] ^ maskKey[i % MemoryLayout<UInt32>.size]
|
||||
offset += 1
|
||||
}
|
||||
return Data(bytes: buffer, count: offset)
|
||||
}
|
||||
return frame
|
||||
}
|
||||
|
||||
func reset() {
|
||||
queue.async { [weak self] in
|
||||
self?.didHandshake = false
|
||||
}
|
||||
}
|
||||
|
||||
///MARK: - parsing methods
|
||||
|
||||
/// read from the input queue until it is empty
|
||||
private func dequeue() {
|
||||
while !inputQueue.isEmpty {
|
||||
autoreleasepool {
|
||||
let data = inputQueue.removeFirst()
|
||||
var work = data
|
||||
if let buffer = fragBuffer {
|
||||
var combine = buffer
|
||||
combine.append(data)
|
||||
work = combine
|
||||
fragBuffer = nil
|
||||
}
|
||||
let length = work.count
|
||||
work.withUnsafeBytes { (buffer: UnsafePointer<UInt8>) in
|
||||
if !didHandshake {
|
||||
processTCPHandshake(buffer, bufferLen: length)
|
||||
} else {
|
||||
processRawMessagesInBuffer(buffer, bufferLen: length)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Process all messages in the buffer if possible.
|
||||
private func processRawMessagesInBuffer(_ pointer: UnsafePointer<UInt8>, bufferLen: Int) {
|
||||
var buffer = UnsafeBufferPointer(start: pointer, count: bufferLen)
|
||||
repeat {
|
||||
buffer = processOneRawMessage(inBuffer: buffer)
|
||||
} while buffer.count >= frameHeaderLength
|
||||
if buffer.count > 0 {
|
||||
fragBuffer = Data(buffer: buffer)
|
||||
}
|
||||
}
|
||||
|
||||
/// process the raw data buffer and parse it into the websocket frames it represents
|
||||
private func processOneRawMessage(inBuffer buffer: UnsafeBufferPointer<UInt8>) -> UnsafeBufferPointer<UInt8> {
|
||||
guard let baseAddress = buffer.baseAddress else {return emptyBuffer}
|
||||
let bytesAvailable = buffer.count
|
||||
|
||||
//need at least two bytes to know what kind of frame it is.
|
||||
if readStack.last != nil && bytesAvailable < frameHeaderLength {
|
||||
fragBuffer = Data(buffer: buffer)
|
||||
return emptyBuffer
|
||||
}
|
||||
|
||||
//handle the current frame
|
||||
if let currentFrame = readStack.last, currentFrame.bytesLeft > 0 {
|
||||
var appendLength = currentFrame.bytesLeft
|
||||
var extraLength = bytesAvailable - currentFrame.bytesLeft
|
||||
|
||||
//this frame still needs more content before it is full
|
||||
let isPartialFrame = currentFrame.bytesLeft > bytesAvailable
|
||||
if isPartialFrame {
|
||||
appendLength = bytesAvailable
|
||||
extraLength = 0 //update for the offset
|
||||
}
|
||||
|
||||
//build buffer
|
||||
var combine = currentFrame.data
|
||||
combine.append(baseAddress, count: appendLength)
|
||||
|
||||
_ = readStack.popLast()
|
||||
if isPartialFrame {
|
||||
readStack.append(WSFrame(code: currentFrame.code, bytesLeft: currentFrame.bytesLeft - appendLength, data: combine))
|
||||
} else {
|
||||
delegate?.didReceive(message: WSMessage(code: currentFrame.code, data: combine))
|
||||
}
|
||||
return buffer.fromOffset(bytesAvailable - extraLength)
|
||||
}
|
||||
|
||||
//new frame!
|
||||
let isFin = (FinMask & baseAddress[0])
|
||||
let receivedOpcodeRawValue = (OpCodeMask & baseAddress[0])
|
||||
let receivedOpcode = WebSocket.OpCode(rawValue: receivedOpcodeRawValue)
|
||||
let isMasked = (MaskMask & baseAddress[1])
|
||||
let payloadLen = (PayloadLenMask & baseAddress[1])
|
||||
var offset = frameHeaderLength //skip past the control opcodes of the frame
|
||||
|
||||
//validate the frame is proper frame
|
||||
if compressionState.supportsCompression && receivedOpcode != .continueFrame {
|
||||
compressionState.messageNeedsDecompression = (RSV1Mask & baseAddress[0]) > 0
|
||||
}
|
||||
|
||||
if (isMasked > 0 || (RSVMask & baseAddress[0]) > 0) && receivedOpcode != .pong && !compressionState.messageNeedsDecompression {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "masked and rsv data is not currently supported", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
let isControlFrame = (receivedOpcode == .connectionClose || receivedOpcode == .ping)
|
||||
if !isControlFrame && (receivedOpcode != .binary && receivedOpcode != .continueFrame &&
|
||||
receivedOpcode != .text && receivedOpcode != .pong) {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "unknown opcode: \(receivedOpcodeRawValue)", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
if isControlFrame && isFin == 0 {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "control frames can't be fragmented", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
|
||||
//process the close code
|
||||
var closeCode = CloseCode.normal.rawValue
|
||||
if receivedOpcode == .connectionClose {
|
||||
if payloadLen == 1 {
|
||||
closeCode = CloseCode.protocolError.rawValue
|
||||
} else if payloadLen > 1 {
|
||||
closeCode = WSMessageParser.readUint16(baseAddress, offset: offset)
|
||||
if closeCode < 1000 || (closeCode > 1003 && closeCode < 1007) || (closeCode > 1013 && closeCode < 3000) {
|
||||
closeCode = CloseCode.protocolError.rawValue
|
||||
}
|
||||
}
|
||||
if payloadLen < 2 {
|
||||
delegate?.didEncounter(error: WSError(type: .expectedClose, message: "connection closed by server", code: closeCode))
|
||||
return emptyBuffer
|
||||
}
|
||||
} else if isControlFrame && payloadLen > 125 {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "control frame using extend payload", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
|
||||
//handle the "body" of the message
|
||||
var dataLength = UInt64(payloadLen)
|
||||
if dataLength == 127 {
|
||||
dataLength = WSMessageParser.readUint64(baseAddress, offset: offset)
|
||||
offset += MemoryLayout<UInt64>.size
|
||||
} else if dataLength == 126 {
|
||||
dataLength = UInt64(WSMessageParser.readUint16(baseAddress, offset: offset))
|
||||
offset += MemoryLayout<UInt16>.size
|
||||
}
|
||||
if bytesAvailable < offset || UInt64(bytesAvailable - offset) < dataLength {
|
||||
fragBuffer = Data(bytes: baseAddress, count: bytesAvailable)
|
||||
return emptyBuffer
|
||||
}
|
||||
var appendLength = dataLength
|
||||
if dataLength > UInt64(bytesAvailable) {
|
||||
appendLength = UInt64(bytesAvailable-offset)
|
||||
}
|
||||
if receivedOpcode == .connectionClose && appendLength > 0 {
|
||||
let size = MemoryLayout<UInt16>.size
|
||||
offset += size
|
||||
appendLength -= UInt64(size)
|
||||
}
|
||||
|
||||
let data: Data
|
||||
if compressionState.messageNeedsDecompression, let decompressor = compressionState.decompressor {
|
||||
do {
|
||||
data = try decompressor.decompress(bytes: baseAddress+offset, count: Int(appendLength), finish: isFin > 0)
|
||||
if isFin > 0 && compressionState.serverNoContextTakeover {
|
||||
try decompressor.reset()
|
||||
}
|
||||
} catch {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "Decompression failed: \(error)", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
} else {
|
||||
data = Data(bytes: baseAddress+offset, count: Int(appendLength))
|
||||
}
|
||||
|
||||
//handle frames by opcodes
|
||||
if receivedOpcode == .connectionClose {
|
||||
var closeReason = "connection closed by server"
|
||||
if let customCloseReason = String(data: data, encoding: .utf8) {
|
||||
closeReason = customCloseReason
|
||||
} else {
|
||||
closeCode = CloseCode.protocolError.rawValue
|
||||
}
|
||||
delegate?.didEncounter(error: WSError(type: .expectedClose, message: closeReason, code: closeCode))
|
||||
return emptyBuffer
|
||||
}
|
||||
if receivedOpcode == .pong || receivedOpcode == .ping {
|
||||
delegate?.didReceive(message: WSMessage(code: receivedOpcode!, data: data))
|
||||
return buffer.fromOffset(offset + Int(appendLength))
|
||||
}
|
||||
|
||||
if let currentFrame = readStack.last {
|
||||
//handle "old" frame
|
||||
if receivedOpcode != .continueFrame {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "second and beyond of fragment message must be a continue frame", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
var combine = currentFrame.data
|
||||
combine.append(data)
|
||||
_ = readStack.popLast()
|
||||
readStack.append(WSFrame(code: currentFrame.code, bytesLeft: currentFrame.bytesLeft - Int(appendLength), data: combine))
|
||||
} else {
|
||||
//handle new frame
|
||||
if receivedOpcode == .continueFrame {
|
||||
delegate?.didEncounter(error: WSError(type: .protocolError, message: "first frame can't be a continue frame", code: CloseCode.protocolError.rawValue))
|
||||
return emptyBuffer
|
||||
}
|
||||
let left = dataLength - appendLength
|
||||
readStack.append(WSFrame(code: receivedOpcode!, bytesLeft: Int(left), data: data))
|
||||
}
|
||||
|
||||
//process response
|
||||
if let currentFrame = readStack.last, currentFrame.bytesLeft <= 0 && isFin > 0 {
|
||||
_ = readStack.popLast()
|
||||
delegate?.didReceive(message: WSMessage(code: currentFrame.code, data: currentFrame.data))
|
||||
}
|
||||
|
||||
let step = Int(offset + numericCast(appendLength))
|
||||
return buffer.fromOffset(step)
|
||||
}
|
||||
|
||||
///MARK: - TCP/HTTP handling
|
||||
|
||||
/// Handle checking the inital connection status
|
||||
private func processTCPHandshake(_ buffer: UnsafePointer<UInt8>, bufferLen: Int) {
|
||||
let code = processHTTP(buffer, bufferLen: bufferLen)
|
||||
switch code {
|
||||
case 0:
|
||||
break
|
||||
case -1:
|
||||
fragBuffer = Data(bytes: buffer, count: bufferLen)
|
||||
break // do nothing, we are going to collect more data
|
||||
default:
|
||||
delegate?.didEncounter(error: WSError(type: .upgradeError, message: "Invalid HTTP upgrade", code: UInt16(code)))
|
||||
}
|
||||
}
|
||||
|
||||
/// Finds the HTTP Packet in the TCP stream, by looking for the CRLF.
|
||||
private func processHTTP(_ buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Int {
|
||||
let CRLFBytes = [UInt8(ascii: "\r"), UInt8(ascii: "\n"), UInt8(ascii: "\r"), UInt8(ascii: "\n")]
|
||||
var k = 0
|
||||
var totalSize = 0
|
||||
for i in 0..<bufferLen {
|
||||
if buffer[i] == CRLFBytes[k] {
|
||||
k += 1
|
||||
if k == 4 {
|
||||
totalSize = i + 1
|
||||
break
|
||||
}
|
||||
} else {
|
||||
k = 0
|
||||
}
|
||||
}
|
||||
if totalSize > 0 {
|
||||
let code = validateResponse(buffer, bufferLen: totalSize)
|
||||
if code != 0 {
|
||||
return code
|
||||
}
|
||||
didHandshake = true
|
||||
let restSize = bufferLen - totalSize
|
||||
if restSize > 0 {
|
||||
processRawMessagesInBuffer(buffer + totalSize, bufferLen: restSize)
|
||||
}
|
||||
return 0 //success
|
||||
}
|
||||
return -1 // Was unable to find the full TCP header.
|
||||
}
|
||||
|
||||
/// Validates the HTTP is a 101 as per the RFC spec.
|
||||
private func validateResponse(_ buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Int {
|
||||
guard let str = String(data: Data(bytes: buffer, count: bufferLen), encoding: .utf8) else { return -1 }
|
||||
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 { return -1 }
|
||||
if let c = Int(responseSplit[1]) {
|
||||
code = c
|
||||
}
|
||||
} else {
|
||||
let responseSplit = str.components(separatedBy: ":")
|
||||
guard responseSplit.count > 1 else { break }
|
||||
let key = responseSplit[0].trimmingCharacters(in: .whitespaces)
|
||||
let val = responseSplit[1].trimmingCharacters(in: .whitespaces)
|
||||
headers[key.lowercased()] = val
|
||||
}
|
||||
i += 1
|
||||
}
|
||||
|
||||
if code != httpSwitchProtocolCode {
|
||||
return code
|
||||
}
|
||||
|
||||
if let extensionHeader = headers[WebSocket.headerWSExtensionName.lowercased()] {
|
||||
processExtensionHeader(extensionHeader)
|
||||
}
|
||||
|
||||
if let acceptKey = headers[WebSocket.headerWSAcceptName.lowercased()] {
|
||||
if acceptKey.count > 0 {
|
||||
if headerSecKey.count > 0 {
|
||||
let sha = "\(headerSecKey)258EAFA5-E914-47DA-95CA-C5AB0DC85B11".sha1Base64()
|
||||
if sha != acceptKey as String {
|
||||
return -1
|
||||
}
|
||||
}
|
||||
delegate?.didParseHTTP(response: str)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
|
||||
/// Parses the extension header, setting up the compression parameters.
|
||||
func processExtensionHeader(_ extensionHeader: String) {
|
||||
let parts = extensionHeader.components(separatedBy: ";")
|
||||
for p in parts {
|
||||
let part = p.trimmingCharacters(in: .whitespaces)
|
||||
if part == "permessage-deflate" {
|
||||
compressionState.supportsCompression = true
|
||||
} else if part.hasPrefix("server_max_window_bits=") {
|
||||
let valString = part.components(separatedBy: "=")[1]
|
||||
if let val = Int(valString.trimmingCharacters(in: .whitespaces)) {
|
||||
compressionState.serverMaxWindowBits = val
|
||||
}
|
||||
} else if part.hasPrefix("client_max_window_bits=") {
|
||||
let valString = part.components(separatedBy: "=")[1]
|
||||
if let val = Int(valString.trimmingCharacters(in: .whitespaces)) {
|
||||
compressionState.clientMaxWindowBits = val
|
||||
}
|
||||
} else if part == "client_no_context_takeover" {
|
||||
compressionState.clientNoContextTakeover = true
|
||||
} else if part == "server_no_context_takeover" {
|
||||
compressionState.serverNoContextTakeover = true
|
||||
}
|
||||
}
|
||||
if compressionState.supportsCompression {
|
||||
compressionState.decompressor = Decompressor(windowBits: compressionState.serverMaxWindowBits)
|
||||
compressionState.compressor = Compressor(windowBits: compressionState.clientMaxWindowBits)
|
||||
}
|
||||
}
|
||||
|
||||
/// Generate a WebSocket key as needed in RFC.
|
||||
static func generateWebSocketKey() -> String {
|
||||
var key = ""
|
||||
let seed = 16
|
||||
for _ in 0..<seed {
|
||||
let uni = UnicodeScalar(UInt32(97 + arc4random_uniform(25)))
|
||||
key += "\(Character(uni!))"
|
||||
}
|
||||
let data = key.data(using: String.Encoding.utf8)
|
||||
let baseKey = data?.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0))
|
||||
return baseKey!
|
||||
}
|
||||
|
||||
/// Read a 16 bit big endian value from a buffer
|
||||
private static func readUint16(_ buffer: UnsafePointer<UInt8>, offset: Int) -> UInt16 {
|
||||
return (UInt16(buffer[offset + 0]) << 8) | UInt16(buffer[offset + 1])
|
||||
}
|
||||
|
||||
/// Read a 64 bit big endian value from a buffer
|
||||
private static func readUint64(_ buffer: UnsafePointer<UInt8>, offset: Int) -> UInt64 {
|
||||
var value = UInt64(0)
|
||||
for i in 0...7 {
|
||||
value = (value << 8) | UInt64(buffer[offset + i])
|
||||
}
|
||||
return value
|
||||
}
|
||||
|
||||
/// Write a 16-bit big endian value to a buffer.
|
||||
static func writeUint16(_ buffer: UnsafeMutablePointer<UInt8>, offset: Int, value: UInt16) {
|
||||
buffer[offset + 0] = UInt8(value >> 8)
|
||||
buffer[offset + 1] = UInt8(value & 0xff)
|
||||
}
|
||||
|
||||
/// Write a 64-bit big endian value to a buffer.
|
||||
private static func writeUint64(_ buffer: UnsafeMutablePointer<UInt8>, offset: Int, value: UInt64) {
|
||||
for i in 0...7 {
|
||||
buffer[offset + i] = UInt8((value >> (8*UInt64(7 - i))) & 0xff)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension UnsafeBufferPointer {
|
||||
func fromOffset(_ offset: Int) -> UnsafeBufferPointer<Element> {
|
||||
return UnsafeBufferPointer<Element>(start: baseAddress?.advanced(by: offset), count: count - offset)
|
||||
}
|
||||
}
|
||||
|
||||
private extension String {
|
||||
func sha1Base64() -> String {
|
||||
let data = self.data(using: String.Encoding.utf8)!
|
||||
var digest = [UInt8](repeating: 0, count:Int(CC_SHA1_DIGEST_LENGTH))
|
||||
data.withUnsafeBytes { _ = CC_SHA1($0, CC_LONG(data.count), &digest) }
|
||||
return Data(bytes: digest).base64EncodedString()
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,9 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Websocket.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 7/16/14.
|
||||
// Copyright (c) 2014-2019 Dalton Cherry.
|
||||
// Copyright (c) 2014-2018 Dalton Cherry.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
@@ -21,31 +20,53 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
import Foundation
|
||||
import CoreFoundation
|
||||
import CommonCrypto
|
||||
|
||||
public let WebsocketDidConnectNotification = "WebsocketDidConnectNotification"
|
||||
public let WebsocketDidDisconnectNotification = "WebsocketDidDisconnectNotification"
|
||||
public let WebsocketDisconnectionErrorKeyName = "WebsocketDisconnectionErrorKeyName"
|
||||
|
||||
//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 ErrorType: Error {
|
||||
case outputStreamWriteError //output stream error during write
|
||||
case compressionError
|
||||
case securityError
|
||||
case invalidSSLError //Invalid SSL certificate
|
||||
case writeTimeoutError //The socket timed out waiting to be ready to write
|
||||
case protocolError //There was an error parsing the WebSocket frames
|
||||
case serverError
|
||||
case upgradeError //There was an error during the HTTP upgrade
|
||||
case closeError //There was an error during the close (socket probably has been dereferenced)
|
||||
case expectedClose //This was a proper close code from the websocket
|
||||
}
|
||||
|
||||
public struct WSError: Error {
|
||||
public let type: ErrorType
|
||||
public let message: String
|
||||
public let code: UInt16
|
||||
|
||||
public init(type: ErrorType, message: String, code: UInt16) {
|
||||
self.type = type
|
||||
self.message = message
|
||||
self.code = code
|
||||
}
|
||||
}
|
||||
|
||||
public protocol WebSocketClient: AnyObject {
|
||||
//WebSocketClient is setup to be dependency injection for testing
|
||||
public protocol WebSocketClient: class {
|
||||
var delegate: WebSocketDelegate? {get set}
|
||||
var pongDelegate: WebSocketPongDelegate? {get set}
|
||||
var isConnected: Bool {get}
|
||||
|
||||
func connect()
|
||||
func disconnect(closeCode: UInt16)
|
||||
func disconnect(forceTimeout: TimeInterval?, closeCode: UInt16)
|
||||
func write(string: String, completion: (() -> ())?)
|
||||
func write(stringData: Data, completion: (() -> ())?)
|
||||
func write(data: Data, completion: (() -> ())?)
|
||||
func write(ping: Data, completion: (() -> ())?)
|
||||
func write(pong: Data, completion: (() -> ())?)
|
||||
@@ -64,111 +85,583 @@ extension WebSocketClient {
|
||||
public func write(ping: Data) {
|
||||
write(ping: ping, completion: nil)
|
||||
}
|
||||
|
||||
|
||||
public func write(pong: Data) {
|
||||
write(pong: pong, completion: nil)
|
||||
}
|
||||
|
||||
public func disconnect() {
|
||||
disconnect(closeCode: CloseCode.normal.rawValue)
|
||||
disconnect(forceTimeout: nil, closeCode: CloseCode.normal.rawValue)
|
||||
}
|
||||
}
|
||||
|
||||
public enum WebSocketEvent {
|
||||
case connected([String: String])
|
||||
case disconnected(String, UInt16)
|
||||
case text(String)
|
||||
case binary(Data)
|
||||
case pong(Data?)
|
||||
case ping(Data?)
|
||||
case error(Error?)
|
||||
case viabilityChanged(Bool)
|
||||
case reconnectSuggested(Bool)
|
||||
case cancelled
|
||||
case peerClosed
|
||||
public protocol WSStreamDelegate: class {
|
||||
func streamIsWaitingForConnectivity()
|
||||
func streamBetterPathUpdate(isBetter: Bool)
|
||||
func streamPathViabilityUpdate(isViable: Bool)
|
||||
func newBytesInStream()
|
||||
func streamDidError(error: Error?)
|
||||
}
|
||||
|
||||
public protocol WebSocketDelegate: AnyObject {
|
||||
func didReceive(event: WebSocketEvent, client: WebSocketClient)
|
||||
/// This protocol is to allow custom implemention of the underlining stream.
|
||||
/// This way custom socket libraries can be used.
|
||||
public protocol WSStream {
|
||||
var delegate: WSStreamDelegate? {get set}
|
||||
func connect(url: URL, port: Int, timeout: TimeInterval, useSSL: Bool, completion: @escaping ((Error?) -> Void))
|
||||
func write(data: Data, completion: @escaping ((Error?) -> Void))
|
||||
func read() -> Data?
|
||||
func cleanup()
|
||||
func isValidSSLCertificate() -> Bool
|
||||
}
|
||||
|
||||
open class WebSocket: WebSocketClient, EngineDelegate {
|
||||
private let engine: Engine
|
||||
public weak var delegate: WebSocketDelegate?
|
||||
public var onEvent: ((WebSocketEvent) -> Void)?
|
||||
|
||||
public var request: URLRequest
|
||||
//WebSocket implementation
|
||||
|
||||
//standard delegate you should use
|
||||
public protocol WebSocketDelegate: class {
|
||||
func websocketDidConnect(socket: WebSocketClient)
|
||||
|
||||
/// Websocket is waiting for connectivity. Socket may connect in the future.
|
||||
/// Available only with NetworkStream.
|
||||
///
|
||||
/// - Parameter socket: Socket
|
||||
func websocketIsWaitingForConnectivity(socket: WebSocketClient)
|
||||
|
||||
/// Informs the delegate about the viability of current socket path. The
|
||||
/// path becomes invalid when you lose connectivity, but may come back up
|
||||
/// again later.
|
||||
///
|
||||
/// - Parameters:
|
||||
/// - socket: Socket
|
||||
/// - isPathViable: Viability of the current path
|
||||
func websocket(_ socket: WebSocketClient, isPathViable: Bool)
|
||||
|
||||
/// Called when network changes and there might be a better path available.
|
||||
/// For example, when you are using cellular data and walk into a building you
|
||||
/// get a Wifi connection. This is when you should attempt to migrate to
|
||||
/// new connection by opening up a new socket. Close the old socket only when
|
||||
/// you got the new socket up. This method may be called again during the
|
||||
/// the time you are making the new connection and the better path is no longer
|
||||
/// available. You can then stop migrating and continue using the old socket.
|
||||
///
|
||||
/// Use in combination with connection viability
|
||||
/// ```
|
||||
/// // Handle connection viability
|
||||
/// socket.onPathViableUpdate = { (isViable) in
|
||||
/// if (!isViable) {
|
||||
/// // Handle connection temporarily losing connectivity
|
||||
/// } else {
|
||||
/// // Handle connection return to connectivity
|
||||
/// }
|
||||
/// }
|
||||
/// // Handle better paths
|
||||
/// socket.onBetterPathUpdate = { (betterPathAvailable) in
|
||||
/// if (betterPathAvailable) {
|
||||
/// // Start a new connection if migration is possible
|
||||
/// } else {
|
||||
/// // Stop any attempts to migrate
|
||||
/// }
|
||||
/// }
|
||||
/// ```
|
||||
/// - Parameters:
|
||||
/// - socket: Socket
|
||||
/// - isBetterPathAvailable: Availability of a better path
|
||||
func websocket(_ socket: WebSocketClient, isBetterPathAvailable: Bool)
|
||||
func websocketDidDisconnect(socket: WebSocketClient, error: Error?)
|
||||
func websocketDidReceiveMessage(socket: WebSocketClient, text: String)
|
||||
func websocketDidReceiveData(socket: WebSocketClient, data: Data)
|
||||
}
|
||||
|
||||
//got pongs
|
||||
public protocol WebSocketPongDelegate: class {
|
||||
func websocketDidReceivePong(socket: WebSocketClient, data: Data?)
|
||||
}
|
||||
|
||||
// A Delegate for see the HTTP upgrade request and response.
|
||||
public protocol WebSocketHTTPDelegate: class {
|
||||
func websocketHttpUpgrade(socket: WebSocket, request: String)
|
||||
func websocketHttpUpgrade(socket: WebSocket, response: String)
|
||||
}
|
||||
|
||||
|
||||
open class WebSocket: NSObject, StreamDelegate, WebSocketClient, WSStreamDelegate, WSMessageParserDelegate {
|
||||
|
||||
public enum OpCode : UInt8 {
|
||||
case continueFrame = 0x0
|
||||
case text = 0x1
|
||||
case binary = 0x2
|
||||
// 3-7 are reserved.
|
||||
case connectionClose = 0x8
|
||||
case ping = 0x9
|
||||
case pong = 0xA
|
||||
// B-F reserved.
|
||||
}
|
||||
|
||||
public static let ErrorDomain = "WebSocket"
|
||||
|
||||
// Where the callback is executed. It defaults to the main UI thread queue.
|
||||
public var callbackQueue = DispatchQueue.main
|
||||
public var respondToPingWithPong: Bool {
|
||||
set {
|
||||
guard let e = engine as? WSEngine else { return }
|
||||
e.respondToPingWithPong = newValue
|
||||
}
|
||||
get {
|
||||
guard let e = engine as? WSEngine else { return true }
|
||||
return e.respondToPingWithPong
|
||||
}
|
||||
|
||||
// MARK: - Constants
|
||||
|
||||
static let headerWSUpgradeName = "Upgrade"
|
||||
static let headerWSUpgradeValue = "websocket"
|
||||
static let headerWSHostName = "Host"
|
||||
static let headerWSConnectionName = "Connection"
|
||||
static let headerWSConnectionValue = "Upgrade"
|
||||
static let headerWSProtocolName = "Sec-WebSocket-Protocol"
|
||||
static let headerWSVersionName = "Sec-WebSocket-Version"
|
||||
static let headerWSVersionValue = "13"
|
||||
static let headerWSExtensionName = "Sec-WebSocket-Extensions"
|
||||
static let headerWSKeyName = "Sec-WebSocket-Key"
|
||||
static let headerOriginName = "Origin"
|
||||
static let headerWSAcceptName = "Sec-WebSocket-Accept"
|
||||
let supportedSSLSchemes = ["wss", "https"]
|
||||
|
||||
// MARK: - Delegates
|
||||
|
||||
/// Responds to callback about new messages coming in over the WebSocket
|
||||
/// and also connection/disconnect messages.
|
||||
public weak var delegate: WebSocketDelegate?
|
||||
|
||||
/// The optional http delegate to see the HTTP request body and response
|
||||
public weak var httpDelegate: WebSocketHTTPDelegate?
|
||||
|
||||
/// Receives a callback for each pong message recived.
|
||||
public weak var pongDelegate: WebSocketPongDelegate?
|
||||
|
||||
public var onConnect: (() -> Void)?
|
||||
public var onDisconnect: ((Error?) -> Void)?
|
||||
public var onWaitingForConnectivity: (() -> Void)?
|
||||
public var onBetterPathUpdate: ((Bool) -> Void)?
|
||||
public var onPathViableUpdate: ((Bool) -> Void)?
|
||||
public var onText: ((String) -> Void)?
|
||||
public var onData: ((Data) -> Void)?
|
||||
public var onPong: ((Data?) -> Void)?
|
||||
public var onHttpResponseHeaders: (([String: String]) -> Void)?
|
||||
|
||||
public var isConnected: Bool {
|
||||
mutex.lock()
|
||||
let isConnected = connected
|
||||
mutex.unlock()
|
||||
return isConnected
|
||||
}
|
||||
|
||||
public init(request: URLRequest, engine: Engine) {
|
||||
public var request: URLRequest //this is only public to allow headers, timeout, etc to be modified on reconnect
|
||||
public var currentURL: URL { return request.url! }
|
||||
|
||||
public var respondToPingWithPong: Bool = true
|
||||
public var enableCompression = true
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private var stream: WSStream
|
||||
private var parser = WSMessageParser()
|
||||
private var connected = false
|
||||
private var isConnecting = false
|
||||
private let mutex = NSLock()
|
||||
private var writeQueue = DispatchQueue(label: "com.vluxe.starscream.wsframe", attributes: [])
|
||||
|
||||
private var certValidated = false
|
||||
private var didDisconnect = false
|
||||
private var readyToWrite = false
|
||||
private var canDispatch: Bool {
|
||||
mutex.lock()
|
||||
let canWork = readyToWrite
|
||||
mutex.unlock()
|
||||
return canWork
|
||||
}
|
||||
|
||||
/**
|
||||
main init method.
|
||||
- Parameter request: The request to start the WebSocket connection with. This includes custom headers, timeout, etc
|
||||
- Parameter protocols: the protocols to send to the websocket server. This is things like "chat" or "superchat".
|
||||
- Parameter stream: The WSStream to use for the underlying connection. This also includes your security options.
|
||||
*/
|
||||
public init(request: URLRequest, protocols: [String]? = nil, stream: WSStream = FoundationStream()) {
|
||||
self.request = request
|
||||
self.engine = engine
|
||||
self.stream = stream
|
||||
if request.value(forHTTPHeaderField: WebSocket.headerOriginName) == nil, let url = request.url {
|
||||
var origin = url.absoluteString
|
||||
if let hostUrl = URL (string: "/", relativeTo: url) {
|
||||
origin = hostUrl.absoluteString
|
||||
origin.remove(at: origin.index(before: origin.endIndex))
|
||||
}
|
||||
self.request.setValue(origin, forHTTPHeaderField: WebSocket.headerOriginName)
|
||||
}
|
||||
if let protocols = protocols, !protocols.isEmpty {
|
||||
self.request.setValue(protocols.joined(separator: ","), forHTTPHeaderField: WebSocket.headerWSProtocolName)
|
||||
}
|
||||
super.init()
|
||||
parser.delegate = self
|
||||
}
|
||||
|
||||
public convenience init(request: URLRequest, certPinner: CertificatePinning? = FoundationSecurity(), compressionHandler: CompressionHandler? = nil, useCustomEngine: Bool = true) {
|
||||
if #available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *), !useCustomEngine {
|
||||
self.init(request: request, engine: NativeEngine())
|
||||
} else if #available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) {
|
||||
self.init(request: request, engine: WSEngine(transport: TCPTransport(), certPinner: certPinner, compressionHandler: compressionHandler))
|
||||
} else {
|
||||
self.init(request: request, engine: WSEngine(transport: FoundationTransport(), certPinner: certPinner, compressionHandler: compressionHandler))
|
||||
/**
|
||||
convenience init to use a URL instead of a URLRequest. Defaults to 5 second timeout.
|
||||
- Parameter url: is where to connect the websocket too.
|
||||
- Parameter protocols: the protocols to send to the websocket server. This is things like "chat" or "superchat".
|
||||
- Parameter stream: The WSStream to use for the underlying connection. This also includes your security options.
|
||||
*/
|
||||
public convenience init(url: URL, protocols: [String]? = nil, stream: WSStream = FoundationStream()) {
|
||||
var request = URLRequest(url: url)
|
||||
request.timeoutInterval = 5
|
||||
self.init(request: request, protocols: protocols, stream: stream)
|
||||
}
|
||||
|
||||
/**
|
||||
Connect to the WebSocket server on a background thread.
|
||||
*/
|
||||
open func connect() {
|
||||
guard !isConnecting else { return }
|
||||
didDisconnect = false
|
||||
isConnecting = true
|
||||
createHTTPRequest()
|
||||
}
|
||||
|
||||
/**
|
||||
Disconnect from the server. I send a Close control frame to the server, then expect the server to respond with a Close control frame and close the socket from its end. I notify my delegate once the socket has been closed.
|
||||
|
||||
If you supply a non-nil `forceTimeout`, I wait at most that long (in seconds) for the server to close the socket. After the timeout expires, I close the socket and notify my delegate.
|
||||
|
||||
If you supply a zero (or negative) `forceTimeout`, I immediately close the socket (without sending a Close control frame) and notify my delegate.
|
||||
|
||||
- Parameter forceTimeout: Maximum time to wait for the server to close the socket.
|
||||
- Parameter closeCode: The code to send on disconnect. The default is the normal close code for cleanly disconnecting a webSocket.
|
||||
*/
|
||||
open func disconnect(forceTimeout: TimeInterval? = nil, closeCode: UInt16 = CloseCode.normal.rawValue) {
|
||||
guard isConnected else { return }
|
||||
switch forceTimeout {
|
||||
case .some(let seconds) where seconds > 0:
|
||||
let milliseconds = Int(seconds * 1_000)
|
||||
callbackQueue.asyncAfter(deadline: .now() + .milliseconds(milliseconds)) { [weak self] in
|
||||
self?.disconnectStream(nil)
|
||||
}
|
||||
fallthrough
|
||||
case .none:
|
||||
writeError(closeCode)
|
||||
default:
|
||||
disconnectStream(nil)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
public func connect() {
|
||||
engine.register(delegate: self)
|
||||
engine.start(request: request)
|
||||
|
||||
/**
|
||||
Write a string to the websocket. This sends it as a text frame.
|
||||
|
||||
If you supply a non-nil completion block, I will perform it when the write completes.
|
||||
|
||||
- parameter string: The string to write.
|
||||
- parameter completion: The (optional) completion handler.
|
||||
*/
|
||||
open func write(string: String, completion: (() -> ())? = nil) {
|
||||
guard isConnected else { return }
|
||||
writeFrame(string.data(using: .utf8)!, code: .text, writeCompletion: completion)
|
||||
}
|
||||
|
||||
/**
|
||||
Write binary data to the websocket. This sends it as a binary frame.
|
||||
|
||||
If you supply a non-nil completion block, I will perform it when the write completes.
|
||||
|
||||
- parameter data: The data to write.
|
||||
- parameter completion: The (optional) completion handler.
|
||||
*/
|
||||
open func write(data: Data, completion: (() -> ())? = nil) {
|
||||
guard isConnected else { return }
|
||||
writeFrame(data, code: .binary, writeCompletion: completion)
|
||||
}
|
||||
|
||||
/**
|
||||
Write a ping to the websocket. This sends it as a control frame.
|
||||
Yodel a sound to the planet. This sends it as an astroid. http://youtu.be/Eu5ZJELRiJ8?t=42s
|
||||
*/
|
||||
open func write(ping: Data, completion: (() -> ())? = nil) {
|
||||
guard isConnected else { return }
|
||||
writeFrame(ping, code: .ping, writeCompletion: completion)
|
||||
}
|
||||
|
||||
/**
|
||||
Write a pong to the websocket. This sends it as a control frame.
|
||||
Respond to a Yodel.
|
||||
*/
|
||||
open func write(pong: Data, completion: (() -> ())? = nil) {
|
||||
guard isConnected else { return }
|
||||
writeFrame(pong, code: .pong, writeCompletion: completion)
|
||||
}
|
||||
|
||||
public func disconnect(closeCode: UInt16 = CloseCode.normal.rawValue) {
|
||||
engine.stop(closeCode: closeCode)
|
||||
/// MARK: - private methods
|
||||
|
||||
/// Starts the connection.
|
||||
private func createHTTPRequest() {
|
||||
guard let url = request.url else { return }
|
||||
var port = url.port
|
||||
if port == nil {
|
||||
if supportedSSLSchemes.contains(url.scheme!) {
|
||||
port = 443
|
||||
} else {
|
||||
port = 80
|
||||
}
|
||||
}
|
||||
request.setValue(WebSocket.headerWSUpgradeValue, forHTTPHeaderField: WebSocket.headerWSUpgradeName)
|
||||
request.setValue(WebSocket.headerWSConnectionValue, forHTTPHeaderField: WebSocket.headerWSConnectionName)
|
||||
request.setValue(WebSocket.headerWSVersionValue, forHTTPHeaderField: WebSocket.headerWSVersionName)
|
||||
request.setValue(parser.headerSecurityKey, forHTTPHeaderField: WebSocket.headerWSKeyName)
|
||||
|
||||
if enableCompression {
|
||||
let val = "permessage-deflate; client_max_window_bits; server_max_window_bits=15"
|
||||
request.setValue(val, forHTTPHeaderField: WebSocket.headerWSExtensionName)
|
||||
}
|
||||
let hostValue = request.allHTTPHeaderFields?[WebSocket.headerWSHostName] ?? "\(url.host!):\(port!)"
|
||||
request.setValue(hostValue, forHTTPHeaderField: WebSocket.headerWSHostName)
|
||||
|
||||
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"
|
||||
|
||||
initStreamsWithData(httpBody.data(using: .utf8)!, Int(port!))
|
||||
httpDelegate?.websocketHttpUpgrade(socket: self, request: httpBody)
|
||||
}
|
||||
|
||||
public func forceDisconnect() {
|
||||
engine.forceStop()
|
||||
|
||||
/// Start the stream connection and write the data to the output stream.
|
||||
private func initStreamsWithData(_ data: Data, _ port: Int) {
|
||||
|
||||
guard let url = request.url else {
|
||||
disconnectStream(nil, runDelegate: true)
|
||||
return
|
||||
|
||||
}
|
||||
// Disconnect and clean up any existing streams before setting up a new one
|
||||
disconnectStream(nil, runDelegate: false)
|
||||
|
||||
let useSSL = supportedSSLSchemes.contains(url.scheme!)
|
||||
|
||||
certValidated = !useSSL
|
||||
let timeout = request.timeoutInterval * 1_000_000
|
||||
stream.delegate = self
|
||||
stream.connect(url: url, port: port, timeout: timeout, useSSL: useSSL, completion: { [weak self] (error) in
|
||||
guard let self = self else {return}
|
||||
if error != nil {
|
||||
self.disconnectStream(error)
|
||||
return
|
||||
}
|
||||
self.writeQueue.async {
|
||||
// Do SSL pinning
|
||||
if !self.certValidated {
|
||||
self.certValidated = self.stream.isValidSSLCertificate()
|
||||
if !self.certValidated {
|
||||
self.disconnectStream(WSError(type: .invalidSSLError, message: "Invalid SSL certificate", code: 0))
|
||||
return
|
||||
}
|
||||
}
|
||||
self.stream.write(data: data, completion: { (error) in
|
||||
if let error = error {
|
||||
self.disconnectStream(error)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
self.mutex.lock()
|
||||
self.readyToWrite = true
|
||||
self.mutex.unlock()
|
||||
}
|
||||
|
||||
public func write(data: Data, completion: (() -> ())?) {
|
||||
write(data: data, opcode: .binaryFrame, completion: completion)
|
||||
}
|
||||
|
||||
public func write(string: String, completion: (() -> ())?) {
|
||||
engine.write(string: string, completion: completion)
|
||||
}
|
||||
|
||||
public func write(stringData: Data, completion: (() -> ())?) {
|
||||
write(data: stringData, opcode: .textFrame, completion: completion)
|
||||
}
|
||||
|
||||
public func write(ping: Data, completion: (() -> ())?) {
|
||||
write(data: ping, opcode: .ping, completion: completion)
|
||||
}
|
||||
|
||||
public func write(pong: Data, completion: (() -> ())?) {
|
||||
write(data: pong, opcode: .pong, completion: completion)
|
||||
}
|
||||
|
||||
private func write(data: Data, opcode: FrameOpCode, completion: (() -> ())?) {
|
||||
engine.write(data: data, opcode: opcode, completion: completion)
|
||||
}
|
||||
|
||||
// MARK: - EngineDelegate
|
||||
public func didReceive(event: WebSocketEvent) {
|
||||
|
||||
/// MARK: - WSStreamDelegate
|
||||
|
||||
public func streamIsWaitingForConnectivity() {
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.delegate?.didReceive(event: event, client: s)
|
||||
s.onEvent?(event)
|
||||
s.onWaitingForConnectivity?()
|
||||
s.delegate?.websocketIsWaitingForConnectivity(socket: s)
|
||||
}
|
||||
}
|
||||
|
||||
public func streamBetterPathUpdate(isBetter: Bool) {
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.onBetterPathUpdate?(isBetter)
|
||||
s.delegate?.websocket(s, isBetterPathAvailable: isBetter)
|
||||
}
|
||||
}
|
||||
|
||||
public func streamPathViabilityUpdate(isViable: Bool) {
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.onPathViableUpdate?(isViable)
|
||||
s.delegate?.websocket(s, isPathViable: isViable)
|
||||
}
|
||||
}
|
||||
|
||||
public func newBytesInStream() {
|
||||
guard let data = stream.read() else { return }
|
||||
parser.append(data: data)
|
||||
}
|
||||
|
||||
public func streamDidError(error: Error?) {
|
||||
disconnectStream(error)
|
||||
}
|
||||
|
||||
///MARK: - WSMessageParserDelegate
|
||||
|
||||
func didReceive(message: WSMessage) {
|
||||
switch message.code {
|
||||
case .ping:
|
||||
handlePing(message)
|
||||
case .text:
|
||||
handleText(message)
|
||||
case .binary:
|
||||
handleBinary(message)
|
||||
case .pong:
|
||||
handlePong(message)
|
||||
case .connectionClose:
|
||||
disconnectStream(nil) // should never fall into this (handled in streamDidError)
|
||||
case .continueFrame:
|
||||
break //should never fall into this
|
||||
}
|
||||
}
|
||||
|
||||
func didEncounter(error: WSError) {
|
||||
writeError(error.code)
|
||||
}
|
||||
|
||||
func didParseHTTP(response: String) {
|
||||
mutex.lock()
|
||||
connected = true
|
||||
isConnecting = false
|
||||
didDisconnect = false
|
||||
mutex.unlock()
|
||||
guard canDispatch else { return }
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.onConnect?()
|
||||
s.delegate?.websocketDidConnect(socket: s)
|
||||
s.httpDelegate?.websocketHttpUpgrade(socket: s, response: response)
|
||||
NotificationCenter.default.post(name: NSNotification.Name(WebsocketDidConnectNotification), object: self)
|
||||
}
|
||||
}
|
||||
|
||||
//MARK: - message handlers
|
||||
|
||||
func handlePing(_ message: WSMessage) {
|
||||
if respondToPingWithPong {
|
||||
writeFrame(message.data, code: .pong)
|
||||
}
|
||||
}
|
||||
|
||||
func handleText(_ message: WSMessage) {
|
||||
guard canDispatch, let str = String(data: message.data, encoding: .utf8) else {
|
||||
writeError(CloseCode.encoding.rawValue)
|
||||
return
|
||||
}
|
||||
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.onText?(str)
|
||||
s.delegate?.websocketDidReceiveMessage(socket: s, text: str)
|
||||
}
|
||||
}
|
||||
|
||||
func handleBinary(_ message: WSMessage) {
|
||||
guard canDispatch else { return }
|
||||
|
||||
let data = message.data
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.onData?(data)
|
||||
s.delegate?.websocketDidReceiveData(socket: s, data: data as Data)
|
||||
}
|
||||
}
|
||||
|
||||
func handlePong(_ message: WSMessage) {
|
||||
guard canDispatch else { return }
|
||||
|
||||
let pongData: Data? = message.data.count > 0 ? message.data : nil
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let s = self else { return }
|
||||
s.onPong?(pongData)
|
||||
s.pongDelegate?.websocketDidReceivePong(socket: s, data: pongData)
|
||||
}
|
||||
}
|
||||
|
||||
//// Disconnect the stream object and notifies the delegate.
|
||||
private func disconnectStream(_ error: Error?, runDelegate: Bool = true) {
|
||||
mutex.lock()
|
||||
stream.cleanup()
|
||||
parser.reset()
|
||||
connected = false
|
||||
mutex.unlock()
|
||||
if runDelegate {
|
||||
doDisconnect(error)
|
||||
}
|
||||
}
|
||||
|
||||
/// Used to preform the disconnect delegate
|
||||
private func doDisconnect(_ error: Error?) {
|
||||
guard !didDisconnect else { return }
|
||||
didDisconnect = true
|
||||
isConnecting = false
|
||||
guard canDispatch else { return }
|
||||
callbackQueue.async { [weak self] in
|
||||
guard let self = self else { return }
|
||||
self.onDisconnect?(error)
|
||||
self.delegate?.websocketDidDisconnect(socket: self, error: error)
|
||||
let userInfo = error.map{ [WebsocketDisconnectionErrorKeyName: $0] }
|
||||
NotificationCenter.default.post(name: NSNotification.Name(WebsocketDidDisconnectNotification), object: self, userInfo: userInfo)
|
||||
}
|
||||
}
|
||||
|
||||
/// Write an error to the socket
|
||||
private func writeError(_ code: UInt16) {
|
||||
let buf = NSMutableData(capacity: MemoryLayout<UInt16>.size)
|
||||
let buffer = UnsafeMutableRawPointer(mutating: buf!.bytes).assumingMemoryBound(to: UInt8.self)
|
||||
WSMessageParser.writeUint16(buffer, offset: 0, value: code)
|
||||
writeFrame(Data(bytes: buffer, count: MemoryLayout<UInt16>.size), code: .connectionClose)
|
||||
}
|
||||
|
||||
/// Used to write things to the stream
|
||||
private func writeFrame(_ data: Data, code: OpCode, writeCompletion: (() -> ())? = nil) {
|
||||
writeQueue.async { [weak self] in
|
||||
guard let s = self, s.connected else { return }
|
||||
let frame = s.parser.createSendFrame(data: data, code: code)
|
||||
s.stream.write(data: frame, completion: {[weak self] (error) in
|
||||
self?.callbackQueue.async {
|
||||
writeCompletion?()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
// MARK: - Deinit
|
||||
|
||||
deinit {
|
||||
mutex.lock()
|
||||
readyToWrite = false
|
||||
stream.cleanup()
|
||||
mutex.unlock()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#if swift(>=4)
|
||||
#else
|
||||
fileprivate extension String {
|
||||
var count: Int {
|
||||
return self.characters.count
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1,218 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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
|
||||
}
|
||||
|
||||
deinit {
|
||||
inputStream?.delegate = nil
|
||||
outputStream?.delegate = nil
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,171 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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
|
||||
|
||||
deinit {
|
||||
disconnect()
|
||||
}
|
||||
|
||||
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()
|
||||
connection = nil
|
||||
}
|
||||
|
||||
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))
|
||||
}
|
||||
|
||||
// Refer to https://developer.apple.com/documentation/network/implementing_netcat_with_network_framework
|
||||
if let context = context, context.isFinal, isComplete {
|
||||
if let delegate = s.delegate {
|
||||
// Let the owner of this TCPTransport decide what to do next: disconnect or reconnect?
|
||||
delegate.connectionChanged(state: .peerClosed)
|
||||
} else {
|
||||
// No use to keep connection alive
|
||||
s.disconnect()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if error == nil {
|
||||
s.readLoop()
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
#else
|
||||
typealias TCPTransport = FoundationTransport
|
||||
#endif
|
||||
@@ -1,63 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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 {
|
||||
/// Ready connections can send and receive data
|
||||
case connected
|
||||
|
||||
/// Waiting connections have not yet been started, or do not have a viable network
|
||||
case waiting
|
||||
|
||||
/// Cancelled connections have been invalidated by the client and will send no more events
|
||||
case cancelled
|
||||
|
||||
/// Failed connections are disconnected and can no longer send or receive data
|
||||
case failed(Error?)
|
||||
|
||||
/// Viability (connection status) of the connection has updated
|
||||
/// e.g. connection is down, connection came back up, etc.
|
||||
case viability(Bool)
|
||||
|
||||
/// Connection ca be upgraded to wifi from cellular.
|
||||
/// You should consider reconnecting to take advantage of this.
|
||||
case shouldReconnect(Bool)
|
||||
|
||||
/// Received data
|
||||
case receive(Data)
|
||||
|
||||
/// Remote peer has closed the network connection.
|
||||
case peerClosed
|
||||
}
|
||||
|
||||
public protocol TransportEventClient: AnyObject {
|
||||
func connectionChanged(state: ConnectionState)
|
||||
}
|
||||
|
||||
public protocol Transport: AnyObject {
|
||||
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 }
|
||||
}
|
||||
+5
-5
@@ -1,16 +1,16 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Starscream"
|
||||
s.version = "4.0.4"
|
||||
s.version = "3.0.6"
|
||||
s.summary = "A conforming WebSocket RFC 6455 client library in Swift."
|
||||
s.homepage = "https://github.com/daltoniam/Starscream"
|
||||
s.license = 'Apache License, Version 2.0'
|
||||
s.author = {'Dalton Cherry' => 'http://daltoniam.com', 'Austin Cherry' => 'http://austincherry.me'}
|
||||
s.source = { :git => 'https://github.com/daltoniam/Starscream.git', :tag => "#{s.version}"}
|
||||
s.social_media_url = 'http://twitter.com/daltoniam'
|
||||
s.ios.deployment_target = '11.0'
|
||||
s.osx.deployment_target = '10.13'
|
||||
s.tvos.deployment_target = '12.0'
|
||||
s.ios.deployment_target = '8.0'
|
||||
s.osx.deployment_target = '10.10'
|
||||
s.tvos.deployment_target = '9.0'
|
||||
s.watchos.deployment_target = '2.0'
|
||||
s.source_files = 'Sources/**/*.swift'
|
||||
s.swift_version = '5.0'
|
||||
s.swift_version = '4.2'
|
||||
end
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 53;
|
||||
objectVersion = 46;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
@@ -12,71 +12,29 @@
|
||||
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, ); }; };
|
||||
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 */; };
|
||||
633624AF219AD2F80053CB46 /* NetworkStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633624AC219AD2F80053CB46 /* NetworkStream.swift */; };
|
||||
633624B0219AD2F80053CB46 /* FoundationStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633624AD219AD2F80053CB46 /* FoundationStream.swift */; };
|
||||
633624B1219AD2F80053CB46 /* WSMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633624AE219AD2F80053CB46 /* WSMessage.swift */; };
|
||||
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 */; };
|
||||
BBB5ABE8215E2217005B48B6 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB5ABE4215E2217005B48B6 /* WebSocket.swift */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
6B0BE7AA24A157BB0051F7A7 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 6B3E79DD19D48B7F006071F7 /* Project object */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
|
||||
remoteInfo = Starscream;
|
||||
};
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
335FA2021F5DF71D00F6D2EC /* Starscream Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Starscream Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
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>"; };
|
||||
633624AC219AD2F80053CB46 /* NetworkStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NetworkStream.swift; path = Starscream/NetworkStream.swift; sourceTree = "<group>"; };
|
||||
633624AD219AD2F80053CB46 /* FoundationStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FoundationStream.swift; path = Starscream/FoundationStream.swift; sourceTree = "<group>"; };
|
||||
633624AE219AD2F80053CB46 /* WSMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WSMessage.swift; path = Starscream/WSMessage.swift; sourceTree = "<group>"; };
|
||||
63895636219AD95900C3C085 /* TestConnection.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = TestConnection.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
@@ -102,28 +60,10 @@
|
||||
/* 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 = (
|
||||
63895636219AD95900C3C085 /* TestConnection.playground */,
|
||||
6B3E79E819D48B7F006071F7 /* Sources */,
|
||||
6B3E79FF19D48C2F006071F7 /* Tests */,
|
||||
6B3E79E719D48B7F006071F7 /* Products */,
|
||||
@@ -143,14 +83,13 @@
|
||||
6B3E79E819D48B7F006071F7 /* Sources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
8ABD446E224C033600FB8370 /* DataBytes */,
|
||||
5C7CB5A522B59A82006AF81B /* Engine */,
|
||||
8A7A718D21F924BF0061166D /* Framer */,
|
||||
8A7A718621F8DB930061166D /* Transport */,
|
||||
8A7A718521F8DB810061166D /* Compression */,
|
||||
8A1681A5223D8648000C08D8 /* Security */,
|
||||
633624AD219AD2F80053CB46 /* FoundationStream.swift */,
|
||||
633624AC219AD2F80053CB46 /* NetworkStream.swift */,
|
||||
633624AE219AD2F80053CB46 /* WSMessage.swift */,
|
||||
BBB5ABE1215E2217005B48B6 /* Compression.swift */,
|
||||
BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */,
|
||||
BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */,
|
||||
BBB5ABE4215E2217005B48B6 /* WebSocket.swift */,
|
||||
5C85661B2257AE7500A371DD /* Server */,
|
||||
5C1360001C473BEF00AA3A01 /* Starscream.h */,
|
||||
6B3E79E919D48B7F006071F7 /* Supporting Files */,
|
||||
);
|
||||
@@ -171,62 +110,10 @@
|
||||
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 = (
|
||||
@@ -260,7 +147,6 @@
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
6B0BE7AB24A157BB0051F7A7 /* PBXTargetDependency */,
|
||||
);
|
||||
name = "Starscream Tests";
|
||||
productName = StarscreamTests;
|
||||
@@ -291,10 +177,9 @@
|
||||
6B3E79DD19D48B7F006071F7 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = YES;
|
||||
LastSwiftMigration = 0700;
|
||||
LastSwiftUpdateCheck = 0700;
|
||||
LastUpgradeCheck = 1430;
|
||||
LastUpgradeCheck = 0900;
|
||||
ORGANIZATIONNAME = Vluxe;
|
||||
TargetAttributes = {
|
||||
335FA1F41F5DF71D00F6D2EC = {
|
||||
@@ -302,16 +187,16 @@
|
||||
};
|
||||
33CCF0841F5DDC030099B092 = {
|
||||
LastSwiftMigration = 0940;
|
||||
ProvisioningStyle = Manual;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = 6B3E79E019D48B7F006071F7 /* Build configuration list for PBXProject "Starscream" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = en;
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
);
|
||||
mainGroup = 6B3E79DC19D48B7F006071F7;
|
||||
productRefGroup = 6B3E79E719D48B7F006071F7 /* Products */;
|
||||
@@ -346,10 +231,6 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
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 */,
|
||||
);
|
||||
@@ -359,72 +240,44 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
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 */,
|
||||
BBB5ABE5215E2217005B48B6 /* Compression.swift in Sources */,
|
||||
BBB5ABE8215E2217005B48B6 /* WebSocket.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 */,
|
||||
633624B0219AD2F80053CB46 /* FoundationStream.swift in Sources */,
|
||||
633624B1219AD2F80053CB46 /* WSMessage.swift in Sources */,
|
||||
BBB5ABE7215E2217005B48B6 /* SSLSecurity.swift in Sources */,
|
||||
BBB5ABE6215E2217005B48B6 /* SSLClientCertificate.swift in Sources */,
|
||||
633624AF219AD2F80053CB46 /* NetworkStream.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXTargetDependency section */
|
||||
6B0BE7AB24A157BB0051F7A7 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = 33CCF0841F5DDC030099B092 /* Starscream */;
|
||||
targetProxy = 6B0BE7AA24A157BB0051F7A7 /* PBXContainerItemProxy */;
|
||||
};
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
335FA2001F5DF71D00F6D2EC /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
APPLICATION_EXTENSION_API_ONLY = NO;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/Developer/Library/Frameworks",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
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",
|
||||
);
|
||||
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 = "-Onone";
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.0;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
@@ -433,30 +286,22 @@
|
||||
buildSettings = {
|
||||
APPLICATION_EXTENSION_API_ONLY = NO;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/Developer/Library/Frameworks",
|
||||
"$(inherited)",
|
||||
);
|
||||
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",
|
||||
);
|
||||
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_COMPILATION_MODE = wholemodule;
|
||||
SWIFT_INSTALL_OBJC_HEADER = NO;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.0;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
@@ -465,33 +310,32 @@
|
||||
buildSettings = {
|
||||
BITCODE_GENERATION_MODE = marker;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
CODE_SIGN_IDENTITY = "Mac Developer";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
DEFINES_MODULE = YES;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||
DYLIB_CURRENT_VERSION = 1;
|
||||
DYLIB_INSTALL_NAME_BASE = "@rpath";
|
||||
ENABLE_MODULE_VERIFIER = YES;
|
||||
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
"@loader_path/Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
|
||||
MARKETING_VERSION = 4.0.4;
|
||||
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
|
||||
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.10;
|
||||
OTHER_LDFLAGS = "-all_load";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE = "";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SDKROOT = "";
|
||||
SKIP_INSTALL = YES;
|
||||
SUPPORTS_MACCATALYST = YES;
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TVOS_DEPLOYMENT_TARGET = 12.0;
|
||||
SWIFT_VERSION = 4.0;
|
||||
TVOS_DEPLOYMENT_TARGET = 9.0;
|
||||
VALID_ARCHS = "x86_64 i386 arm64 armv7s armv7 armv7k";
|
||||
WATCHOS_DEPLOYMENT_TARGET = 2.0;
|
||||
};
|
||||
name = Debug;
|
||||
@@ -501,34 +345,32 @@
|
||||
buildSettings = {
|
||||
BITCODE_GENERATION_MODE = bitcode;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
DEFINES_MODULE = YES;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
DYLIB_COMPATIBILITY_VERSION = 1;
|
||||
DYLIB_CURRENT_VERSION = 1;
|
||||
DYLIB_INSTALL_NAME_BASE = "@rpath";
|
||||
ENABLE_MODULE_VERIFIER = YES;
|
||||
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
"@loader_path/Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
|
||||
MARKETING_VERSION = 4.0.4;
|
||||
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
|
||||
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.10;
|
||||
OTHER_LDFLAGS = "-all_load";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE = "";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SDKROOT = "";
|
||||
SKIP_INSTALL = YES;
|
||||
SUPPORTS_MACCATALYST = YES;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
|
||||
SWIFT_VERSION = 5.0;
|
||||
TVOS_DEPLOYMENT_TARGET = 12.0;
|
||||
SWIFT_VERSION = 4.0;
|
||||
TVOS_DEPLOYMENT_TARGET = 9.0;
|
||||
VALID_ARCHS = "x86_64 i386 arm64 armv7s armv7 armv7k";
|
||||
WATCHOS_DEPLOYMENT_TARGET = 2.0;
|
||||
};
|
||||
name = Release;
|
||||
@@ -538,7 +380,6 @@
|
||||
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;
|
||||
@@ -547,25 +388,22 @@
|
||||
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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
@@ -583,13 +421,15 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos xros xrsimulator";
|
||||
SDKROOT = "";
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
|
||||
SWIFT_VERSION = 4.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,3,4";
|
||||
VALID_ARCHS = "x86_64 i386";
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
VERSION_INFO_PREFIX = "";
|
||||
};
|
||||
@@ -600,7 +440,6 @@
|
||||
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;
|
||||
@@ -609,25 +448,22 @@
|
||||
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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = YES;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
@@ -638,12 +474,14 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos xros xrsimulator";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
|
||||
SDKROOT = "";
|
||||
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
|
||||
SWIFT_VERSION = 4.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 = "1430"
|
||||
LastUpgradeVersion = "0900"
|
||||
version = "1.7">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
@@ -26,17 +26,9 @@
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
language = ""
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
codeCoverageEnabled = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "33CCF0841F5DDC030099B092"
|
||||
BuildableName = "Starscream.framework"
|
||||
BlueprintName = "Starscream"
|
||||
ReferencedContainer = "container:Starscream.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<Testables>
|
||||
<TestableReference
|
||||
skipped = "NO">
|
||||
@@ -53,11 +45,23 @@
|
||||
</LocationScenarioReference>
|
||||
</TestableReference>
|
||||
</Testables>
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "33CCF0841F5DDC030099B092"
|
||||
BuildableName = "Starscream.framework"
|
||||
BlueprintName = "Starscream"
|
||||
ReferencedContainer = "container:Starscream.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
language = ""
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
@@ -73,6 +77,8 @@
|
||||
ReferencedContainer = "container:Starscream.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
import Starscream
|
||||
import PlaygroundSupport
|
||||
|
||||
PlaygroundPage.current.needsIndefiniteExecution = true
|
||||
|
||||
let websocket = WebSocket(request: URLRequest(url: URL(string: "ws://echo.websocket.org")!), stream: NetworkStream())
|
||||
|
||||
websocket.onConnect = {
|
||||
print("connected")
|
||||
|
||||
websocket.write(string: "Hello")
|
||||
}
|
||||
|
||||
websocket.onDisconnect = { error in
|
||||
print("error:", error)
|
||||
}
|
||||
|
||||
websocket.onText = { text in
|
||||
print(text)
|
||||
}
|
||||
|
||||
websocket.connect()
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<playground version='5.0' target-platform='macos' executeOnSourceChanges='false'>
|
||||
<timeline fileName='timeline.xctimeline'/>
|
||||
</playground>
|
||||
@@ -0,0 +1,55 @@
|
||||
//
|
||||
// FakeStream.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 7/26/18.
|
||||
// Copyright © 2018 Vluxe. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
class FakeStream: WSStream, TestServerDelegate {
|
||||
var delegate: WSStreamDelegate?
|
||||
let server: TestServer
|
||||
var buffer: Data?
|
||||
|
||||
init(server: TestServer) {
|
||||
self.server = server
|
||||
self.server.delegate = self
|
||||
}
|
||||
|
||||
func connect(url: URL, port: Int, timeout: TimeInterval, useSSL: Bool, completion: @escaping ((Error?) -> Void)) {
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
|
||||
self.server.start()
|
||||
completion(nil)
|
||||
})
|
||||
}
|
||||
|
||||
func write(data: Data, completion: @escaping ((Error?) -> Void)) {
|
||||
server.receive(data: data)
|
||||
}
|
||||
|
||||
func read() -> Data? {
|
||||
let data = buffer
|
||||
buffer = nil
|
||||
return data
|
||||
}
|
||||
|
||||
func cleanup() {
|
||||
buffer = nil
|
||||
}
|
||||
|
||||
func isValidSSLCertificate() -> Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
///MARK: - TestServerDelegate
|
||||
func didSend(data: Data) {
|
||||
if buffer != nil {
|
||||
buffer?.append(data)
|
||||
} else {
|
||||
buffer = data
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,201 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// FuzzingTests.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 1/28/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 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
|
||||
case .peerClosed:
|
||||
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.
|
||||
}
|
||||
@@ -1,144 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// MockServer.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 1/29/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
|
||||
@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)
|
||||
}
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// MockTransport.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 1/29/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
|
||||
@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,44 +1,64 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// StarscreamTests.swift
|
||||
// StarscreamTests
|
||||
//
|
||||
// Created by Austin Cherry on 9/25/14.
|
||||
// Copyright © 2014 Vluxe. All rights reserved.
|
||||
// Copyright (c) 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 XCTest
|
||||
|
||||
class StarscreamTests: XCTestCase {
|
||||
|
||||
var socket: WebSocket!
|
||||
let testServer = TestServer()
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
let url = URL(string: "http://fakedomain.com")! //not a real request
|
||||
let req = URLRequest(url: url)
|
||||
let fakeStream = FakeStream(server: testServer)
|
||||
socket = WebSocket(request: req, protocols: nil, stream: fakeStream)
|
||||
// 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 runSocket() {
|
||||
socket.onText = { [weak self] (text: String) in
|
||||
self?.socket.write(string: text)
|
||||
}
|
||||
socket.onData = { [weak self] (data: Data) in
|
||||
self?.socket.write(data: data)
|
||||
}
|
||||
var once = false
|
||||
socket.onDisconnect = {[weak self] (error: Error?) in
|
||||
if !once {
|
||||
once = true
|
||||
let status = self?.testServer.passed ?? false
|
||||
if status {
|
||||
XCTAssert(true, "Pass")
|
||||
} else {
|
||||
XCTAssert(false, "Failed")
|
||||
}
|
||||
}
|
||||
}
|
||||
socket.connect()
|
||||
}
|
||||
|
||||
func testExample() {
|
||||
// This is an example of a functional test case.
|
||||
XCTAssert(true, "Pass")
|
||||
}
|
||||
|
||||
// func testCase1() {
|
||||
// testServer.testCase = .case1
|
||||
// runSocket()
|
||||
// }
|
||||
|
||||
|
||||
|
||||
func testPerformanceExample() {
|
||||
// This is an example of a performance test case.
|
||||
self.measure() {
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
//
|
||||
// TestServer.swift
|
||||
// Starscream
|
||||
//
|
||||
// Created by Dalton Cherry on 7/26/18.
|
||||
// Copyright © 2018 Vluxe. All rights reserved.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
enum TestCase {
|
||||
case case1
|
||||
case case2
|
||||
}
|
||||
|
||||
protocol TestServerDelegate: class {
|
||||
func didSend(data: Data)
|
||||
}
|
||||
|
||||
class TestServer {
|
||||
var testCase: TestCase?
|
||||
weak var delegate: TestServerDelegate?
|
||||
var buffer = Data()
|
||||
var passed = false
|
||||
|
||||
func start() {
|
||||
guard let testCase = testCase else { return }
|
||||
switch testCase {
|
||||
case .case1:
|
||||
case1()
|
||||
case .case2:
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
func receive(data: Data) {
|
||||
buffer.append(data)
|
||||
}
|
||||
|
||||
func cleanup() {
|
||||
buffer = Data()
|
||||
}
|
||||
|
||||
//MARK: - the cases!
|
||||
|
||||
func case1() {
|
||||
//TODO: Websocket server framing
|
||||
//let data = "".data(using: .utf8)!
|
||||
//delegate?.didSend(data: frame)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -o pipefail && xcodebuild -project Starscream.xcodeproj -scheme Starscream CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build | xcpretty
|
||||
swift build
|
||||
pod repo update
|
||||
pod lib lint --verbose
|
||||
@@ -3,7 +3,7 @@
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 53;
|
||||
objectVersion = 46;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
@@ -12,11 +12,18 @@
|
||||
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,36 +38,15 @@
|
||||
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
|
||||
remoteInfo = Starscream;
|
||||
};
|
||||
5CF1D06B22552AA30081C8A8 /* PBXContainerItemProxy */ = {
|
||||
5CF15740210A738400869246 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
|
||||
remoteInfo = "Starscream Tests";
|
||||
};
|
||||
5CF1D07322552B770081C8A8 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
|
||||
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>"; };
|
||||
@@ -69,6 +55,9 @@
|
||||
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 */
|
||||
|
||||
@@ -81,6 +70,13 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
5C178E2E1B62D0B900A97204 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
@@ -88,6 +84,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
5C178E1E1B62D0B900A97204 /* Autobahn */,
|
||||
5C178E341B62D0B900A97204 /* AutobahnTests */,
|
||||
5C178E1D1B62D0B900A97204 /* Products */,
|
||||
5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */,
|
||||
);
|
||||
@@ -97,6 +94,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
5C178E1C1B62D0B900A97204 /* Autobahn.app */,
|
||||
5C178E311B62D0B900A97204 /* AutobahnTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
@@ -122,11 +120,28 @@
|
||||
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 */,
|
||||
5CF1D06C22552AA30081C8A8 /* Starscream Tests.xctest */,
|
||||
5CF15741210A738400869246 /* Starscream Tests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
@@ -141,40 +156,60 @@
|
||||
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 */
|
||||
5C178E141B62D0B900A97204 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
BuildIndependentTargetsInParallel = YES;
|
||||
LastSwiftMigration = 0700;
|
||||
LastSwiftUpdateCheck = 0700;
|
||||
LastUpgradeCheck = 1430;
|
||||
LastUpgradeCheck = 0640;
|
||||
ORGANIZATIONNAME = vluxe;
|
||||
TargetAttributes = {
|
||||
5C178E1B1B62D0B900A97204 = {
|
||||
CreatedOnToolsVersion = 6.4;
|
||||
LastSwiftMigration = 0800;
|
||||
LastSwiftMigration = 1000;
|
||||
};
|
||||
5C178E301B62D0B900A97204 = {
|
||||
CreatedOnToolsVersion = 6.4;
|
||||
LastSwiftMigration = 1000;
|
||||
TestTargetID = 5C178E1B1B62D0B900A97204;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = 5C178E171B62D0B900A97204 /* Build configuration list for PBXProject "Autobahn" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = en;
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
@@ -192,6 +227,7 @@
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
5C178E1B1B62D0B900A97204 /* Autobahn */,
|
||||
5C178E301B62D0B900A97204 /* AutobahnTests */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
@@ -204,11 +240,11 @@
|
||||
remoteRef = 5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
5CF1D06C22552AA30081C8A8 /* Starscream Tests.xctest */ = {
|
||||
5CF15741210A738400869246 /* Starscream Tests.xctest */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = wrapper.cfbundle;
|
||||
path = "Starscream Tests.xctest";
|
||||
remoteRef = 5CF1D06B22552AA30081C8A8 /* PBXContainerItemProxy */;
|
||||
remoteRef = 5CF15740210A738400869246 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
/* End PBXReferenceProxy section */
|
||||
@@ -224,6 +260,13 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
5C178E2F1B62D0B900A97204 /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
@@ -236,19 +279,27 @@
|
||||
);
|
||||
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 */
|
||||
@@ -275,36 +326,23 @@
|
||||
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;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
@@ -320,7 +358,7 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
@@ -333,29 +371,17 @@
|
||||
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;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_COMMA = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
@@ -371,10 +397,9 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = iphoneos;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
@@ -383,36 +408,64 @@
|
||||
5C178E3C1B62D0B900A97204 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
INFOPLIST_FILE = Autobahn/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = On;
|
||||
SWIFT_VERSION = 4.2;
|
||||
};
|
||||
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;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_SWIFT3_OBJC_INFERENCE = On;
|
||||
SWIFT_VERSION = 4.2;
|
||||
};
|
||||
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_SWIFT3_OBJC_INFERENCE = On;
|
||||
SWIFT_VERSION = 4.2;
|
||||
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_SWIFT3_OBJC_INFERENCE = On;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Autobahn.app/Autobahn";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
@@ -437,6 +490,15 @@
|
||||
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 */;
|
||||
|
||||
@@ -1,15 +1,5 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "20x20",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "20x20",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "29x29",
|
||||
@@ -40,16 +30,6 @@
|
||||
"size" : "60x60",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "20x20",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "20x20",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "29x29",
|
||||
@@ -79,16 +59,6 @@
|
||||
"idiom" : "ipad",
|
||||
"size" : "76x76",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "83.5x83.5",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ios-marketing",
|
||||
"size" : "1024x1024",
|
||||
"scale" : "1x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
||||
@@ -13,44 +13,39 @@ class ViewController: UIViewController {
|
||||
|
||||
let host = "localhost:9001"
|
||||
var socketArray = [WebSocket]()
|
||||
var caseCount = 300 //starting cases
|
||||
var caseCount = 320 //starting cases
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
getCaseCount()
|
||||
//getTestInfo(1)
|
||||
//runTest(304)
|
||||
//runTest(1)
|
||||
}
|
||||
|
||||
func removeSocket(_ s: WebSocket?) {
|
||||
guard let s = s else {return}
|
||||
socketArray = socketArray.filter{$0 !== s}
|
||||
socketArray = socketArray.filter{$0 != s}
|
||||
}
|
||||
|
||||
func getCaseCount() {
|
||||
let req = URLRequest(url: URL(string: "ws://\(host)/getCaseCount")!)
|
||||
let s = WebSocket(request: req)
|
||||
|
||||
let s = WebSocket(url: URL(string: "ws://\(host)/getCaseCount")!, protocols: [], stream: FoundationStream()) //NetworkStream
|
||||
socketArray.append(s)
|
||||
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.onText = { [weak self] (text: String) in
|
||||
if let c = Int(text) {
|
||||
print("number of cases is: \(c)")
|
||||
self?.caseCount = c
|
||||
}
|
||||
}
|
||||
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!,
|
||||
@@ -66,19 +61,14 @@ class ViewController: UIViewController {
|
||||
// print("error parsing the json")
|
||||
// }
|
||||
|
||||
// }
|
||||
}
|
||||
var once = false
|
||||
s.onEvent = { [weak self] event in
|
||||
switch event {
|
||||
case .disconnected(_, _), .error(_):
|
||||
if !once {
|
||||
once = true
|
||||
self?.runTest(caseNum)
|
||||
}
|
||||
self?.removeSocket(s)
|
||||
default:
|
||||
break
|
||||
s.onDisconnect = { [weak self, weak s] (error: Error?) in
|
||||
if !once {
|
||||
once = true
|
||||
self?.runTest(caseNum)
|
||||
}
|
||||
self?.removeSocket(s)
|
||||
}
|
||||
s.connect()
|
||||
}
|
||||
@@ -86,99 +76,98 @@ 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.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)
|
||||
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()
|
||||
}
|
||||
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()
|
||||
//timeout
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 480, execute: {
|
||||
if !once {
|
||||
s.disconnect(forceTimeout: 0, closeCode: CloseCode.normal.rawValue)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
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.onEvent = { [weak self, weak s] event in
|
||||
switch event {
|
||||
case .disconnected(_, _):
|
||||
print("finished all the tests!")
|
||||
self?.removeSocket(s)
|
||||
default:
|
||||
break
|
||||
}
|
||||
s.onDisconnect = { [weak self, weak s] (error: Error?) in
|
||||
print("finished all the tests!")
|
||||
self?.removeSocket(s)
|
||||
}
|
||||
s.connect()
|
||||
}
|
||||
|
||||
func createSocket(_ cmd: String, _ caseNum: Int) -> WebSocket {
|
||||
let req = URLRequest(url: URL(string: "ws://\(host)\(buildPath(cmd,caseNum))")!)
|
||||
//return WebSocket(request: req, compressionHandler: WSCompression())
|
||||
return WebSocket(request: req)
|
||||
return WebSocket(url: URL(string: "ws://\(host)\(buildPath(cmd,caseNum))")!, protocols: [], stream: FoundationStream()) //NetworkStream
|
||||
}
|
||||
|
||||
func buildPath(_ cmd: String, _ caseNum: Int) -> String {
|
||||
return "/\(cmd)?case=\(caseNum)&agent=Starscream"
|
||||
}
|
||||
|
||||
override func didReceiveMemoryWarning() {
|
||||
super.didReceiveMemoryWarning()
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
//
|
||||
// AutobahnTests.swift
|
||||
// AutobahnTests
|
||||
//
|
||||
// Created by Dalton Cherry on 7/24/15.
|
||||
// Copyright (c) 2015 vluxe. All rights reserved.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
import XCTest
|
||||
|
||||
class AutobahnTests: XCTestCase {
|
||||
|
||||
override func setUp() {
|
||||
super.setUp()
|
||||
// Put setup code here. This method is called before the invocation of each test method in the class.
|
||||
}
|
||||
|
||||
override func tearDown() {
|
||||
// Put teardown code here. This method is called after the invocation of each test method in the class.
|
||||
super.tearDown()
|
||||
}
|
||||
|
||||
func testExample() {
|
||||
// This is an example of a functional test case.
|
||||
XCTAssert(true, "Pass")
|
||||
}
|
||||
|
||||
func testPerformanceExample() {
|
||||
// This is an example of a performance test case.
|
||||
self.measure() {
|
||||
// Put the code you want to measure the time of here.
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -20,9 +20,37 @@
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
|
||||
remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
|
||||
remoteInfo = Starscream;
|
||||
};
|
||||
5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
|
||||
remoteInfo = StarscreamOSX;
|
||||
};
|
||||
5C06AE8C1B08044600D41060 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = D9C3E36919E48FF1009FC285;
|
||||
remoteInfo = StarscreamOSXTests;
|
||||
};
|
||||
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 */;
|
||||
@@ -30,12 +58,12 @@
|
||||
remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
|
||||
remoteInfo = Starscream;
|
||||
};
|
||||
8AF56D58224A80460020CD2F /* PBXContainerItemProxy */ = {
|
||||
6B3E7A0F19D48D00006071F7 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 6B3E7A0819D48D00006071F7 /* Starscream.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
|
||||
remoteInfo = "Starscream Tests";
|
||||
remoteGlobalIDString = 6B3E79F119D48B7F006071F7;
|
||||
remoteInfo = StarscreamTests;
|
||||
};
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
@@ -115,7 +143,11 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
6B3E7A0E19D48D00006071F7 /* Starscream.framework */,
|
||||
8AF56D59224A80460020CD2F /* Starscream Tests.xctest */,
|
||||
6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */,
|
||||
5C06AE8B1B08044600D41060 /* Starscream.framework */,
|
||||
5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */,
|
||||
5C42C3E11D8F31DC00947AA2 /* Starscream.framework */,
|
||||
5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
@@ -149,7 +181,7 @@
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastSwiftUpdateCheck = 0700;
|
||||
LastUpgradeCheck = 1020;
|
||||
LastUpgradeCheck = 0900;
|
||||
ORGANIZATIONNAME = vluxe;
|
||||
TargetAttributes = {
|
||||
5C765ADA199A6DAA003D9110 = {
|
||||
@@ -160,7 +192,7 @@
|
||||
};
|
||||
buildConfigurationList = 5C765AD6199A6DAA003D9110 /* Build configuration list for PBXProject "SimpleTest" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = en;
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
@@ -183,6 +215,34 @@
|
||||
/* 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;
|
||||
@@ -190,11 +250,11 @@
|
||||
remoteRef = 6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
8AF56D59224A80460020CD2F /* Starscream Tests.xctest */ = {
|
||||
6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = wrapper.cfbundle;
|
||||
path = "Starscream Tests.xctest";
|
||||
remoteRef = 8AF56D58224A80460020CD2F /* PBXContainerItemProxy */;
|
||||
path = "Starscream iOSTests.xctest";
|
||||
remoteRef = 6B3E7A0F19D48D00006071F7 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
/* End PBXReferenceProxy section */
|
||||
@@ -247,7 +307,6 @@
|
||||
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;
|
||||
@@ -256,14 +315,12 @@
|
||||
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;
|
||||
@@ -303,7 +360,6 @@
|
||||
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;
|
||||
@@ -312,14 +368,12 @@
|
||||
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;
|
||||
@@ -354,11 +408,10 @@
|
||||
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 = 5.0;
|
||||
SWIFT_VERSION = 4.0;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
@@ -368,11 +421,10 @@
|
||||
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 = 5.0;
|
||||
SWIFT_VERSION = 4.0;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
|
||||
BIN
Binary file not shown.
@@ -1,24 +1,10 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// AppDelegate.swift
|
||||
// SimpleTest
|
||||
//
|
||||
// Created by Dalton Cherry on 8/12/14.
|
||||
// Copyright © 2014 Vluxe. All rights reserved.
|
||||
// Copyright (c) 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
|
||||
|
||||
@@ -28,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
|
||||
var window: UIWindow?
|
||||
|
||||
|
||||
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
|
||||
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
|
||||
// Override point for customization after application launch.
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -22,11 +22,6 @@
|
||||
<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,82 +1,48 @@
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// ViewController.swift
|
||||
// SimpleTest
|
||||
//
|
||||
// Created by Dalton Cherry on 8/12/14.
|
||||
// Copyright © 2014 Vluxe. All rights reserved.
|
||||
// Copyright (c) 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()
|
||||
//https://echo.websocket.org
|
||||
var request = URLRequest(url: URL(string: "http://localhost:8080")!) //https://localhost:8080
|
||||
var request = URLRequest(url: URL(string: "http://localhost:8080")!)
|
||||
request.timeoutInterval = 5
|
||||
socket = WebSocket(request: request)
|
||||
socket.delegate = self
|
||||
socket.connect()
|
||||
}
|
||||
|
||||
// MARK: - WebSocketDelegate
|
||||
func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) {
|
||||
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)
|
||||
case .peerClosed:
|
||||
break
|
||||
// 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")
|
||||
}
|
||||
}
|
||||
|
||||
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")
|
||||
}
|
||||
func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
|
||||
print("Received text: \(text)")
|
||||
}
|
||||
|
||||
func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
|
||||
print("Received data: \(data.count)")
|
||||
}
|
||||
|
||||
// MARK: Write Text Action
|
||||
@@ -88,7 +54,7 @@ class ViewController: UIViewController, WebSocketDelegate {
|
||||
// MARK: Disconnect Action
|
||||
|
||||
@IBAction func disconnect(_ sender: UIBarButtonItem) {
|
||||
if isConnected {
|
||||
if socket.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
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
|
||||
:path: "../../"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
Starscream: 96cd79a6b7ef6a2ff2d00638c73bd195a5322586
|
||||
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
|
||||
|
||||
PODFILE CHECKSUM: 96d91933fe13671aaa81af8a8675ff7698068845
|
||||
|
||||
COCOAPODS: 1.6.0.beta.1
|
||||
COCOAPODS: 1.6.0.beta.2
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
|
||||
:path: "../../"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
Starscream: 96cd79a6b7ef6a2ff2d00638c73bd195a5322586
|
||||
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
|
||||
|
||||
PODFILE CHECKSUM: 96d91933fe13671aaa81af8a8675ff7698068845
|
||||
|
||||
COCOAPODS: 1.6.0.beta.1
|
||||
COCOAPODS: 1.6.0.beta.2
|
||||
|
||||
+210
-1
@@ -1,5 +1,214 @@
|
||||
<?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">
|
||||
<string></string>
|
||||
<dict>
|
||||
<key>PreferenceSpecifiers</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>FooterText</key>
|
||||
<string>This application makes use of the following third party libraries:</string>
|
||||
<key>Title</key>
|
||||
<string>Acknowledgements</string>
|
||||
<key>Type</key>
|
||||
<string>PSGroupSpecifier</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>FooterText</key>
|
||||
<string> Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
Copyright (c) 2014-2016 Dalton Cherry.
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.</string>
|
||||
<key>License</key>
|
||||
<string>Apache License, Version 2.0</string>
|
||||
<key>Title</key>
|
||||
<string>Starscream</string>
|
||||
<key>Type</key>
|
||||
<string>PSGroupSpecifier</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>FooterText</key>
|
||||
<string>Generated by CocoaPods - https://cocoapods.org</string>
|
||||
<key>Title</key>
|
||||
<string></string>
|
||||
<key>Type</key>
|
||||
<string>PSGroupSpecifier</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>StringsTable</key>
|
||||
<string>Acknowledgements</string>
|
||||
<key>Title</key>
|
||||
<string>Acknowledgements</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
+12
-7
@@ -3,10 +3,15 @@ set -e
|
||||
set -u
|
||||
set -o pipefail
|
||||
|
||||
function on_error {
|
||||
echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
|
||||
}
|
||||
trap 'on_error $LINENO' ERR
|
||||
|
||||
if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
|
||||
# If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
|
||||
# frameworks to, so exit 0 (signalling the script phase was successful).
|
||||
exit 0
|
||||
# If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
|
||||
# frameworks to, so exit 0 (signalling the script phase was successful).
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
||||
@@ -36,8 +41,8 @@ install_framework()
|
||||
local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
||||
|
||||
if [ -L "${source}" ]; then
|
||||
echo "Symlinked..."
|
||||
source="$(readlink "${source}")"
|
||||
echo "Symlinked..."
|
||||
source="$(readlink "${source}")"
|
||||
fi
|
||||
|
||||
# Use filter instead of exclude so missing patterns don't throw errors.
|
||||
@@ -67,7 +72,7 @@ install_framework()
|
||||
# Embed linked Swift runtime libraries. No longer necessary as of Xcode 7.
|
||||
if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then
|
||||
local swift_runtime_libs
|
||||
swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]})
|
||||
swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u)
|
||||
for lib in $swift_runtime_libs; do
|
||||
echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
|
||||
rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
|
||||
@@ -136,7 +141,7 @@ strip_invalid_archs() {
|
||||
for arch in $binary_archs; do
|
||||
if ! [[ "${ARCHS}" == *"$arch"* ]]; then
|
||||
# Strip non-valid architectures in-place
|
||||
lipo -remove "$arch" -output "$binary" "$binary" || exit 1
|
||||
lipo -remove "$arch" -output "$binary" "$binary"
|
||||
stripped="$stripped $arch"
|
||||
fi
|
||||
done
|
||||
|
||||
+1
-1
@@ -1,8 +1,8 @@
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Starscream"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Starscream/Starscream.framework/Headers"
|
||||
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
||||
OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Starscream/Starscream.framework/Headers"
|
||||
OTHER_LDFLAGS = $(inherited) -framework "Starscream"
|
||||
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
|
||||
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||
|
||||
+1
-1
@@ -1,8 +1,8 @@
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Starscream"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/Starscream/Starscream.framework/Headers"
|
||||
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
||||
OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/Starscream/Starscream.framework/Headers"
|
||||
OTHER_LDFLAGS = $(inherited) -framework "Starscream"
|
||||
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
|
||||
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||
|
||||
@@ -11,7 +11,20 @@ import UIKit
|
||||
import Starscream
|
||||
|
||||
class ViewController: UIViewController, WebSocketDelegate {
|
||||
func websocketIsWaitingForConnectivity(socket: WebSocketClient) {
|
||||
|
||||
}
|
||||
|
||||
func websocket(_ socket: WebSocketClient, isPathViable: Bool) {
|
||||
|
||||
}
|
||||
|
||||
func websocket(_ socket: WebSocketClient, isBetterPathAvailable: Bool) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
// var socket: WebSocket = WebSocket(url: URL(staticString: "wss://echo.websocket.org"), stream: NetworkStream())
|
||||
var socket: WebSocket = WebSocket(url: URL(staticString: "wss://echo.websocket.org"))
|
||||
|
||||
func websocketDidConnect(socket: WebSocketClient) {
|
||||
|
||||
+13
-14
@@ -2,28 +2,27 @@ default_platform(:ios)
|
||||
|
||||
update_fastlane
|
||||
|
||||
|
||||
desc "Run tests"
|
||||
lane :test do
|
||||
run_tests(
|
||||
devices: ["iPhone 14 Pro", "iPad Pro (11-inch) (4th generation)"],
|
||||
)
|
||||
end
|
||||
|
||||
platform :ios do
|
||||
desc "Deploy new version"
|
||||
desc "Depoy new version"
|
||||
lane :release do
|
||||
version = version_bump_podspec(path: "Starscream.podspec", version_number: ENV["TAG"])
|
||||
changelog = changelog_from_git_commits(merge_commit_filtering: "exclude_merges")
|
||||
ensure_git_branch
|
||||
version = version_get_podspec(path: "Starscream.podspec")
|
||||
changelog = prompt(text: "Changelog: ", multi_line_end_keyword: "END")
|
||||
|
||||
github_token = ENV['GITHUB_TOKEN']
|
||||
if !github_token || github_token.empty?
|
||||
github_token = prompt(text: "Please enter your GitHub token: ")
|
||||
end
|
||||
|
||||
github_release = set_github_release(
|
||||
repository_name: "daltoniam/starscream",
|
||||
api_token: ENV["GITHUB_TOKEN"],
|
||||
repository_name: "daltoniam/Starscream",
|
||||
api_token: github_token,
|
||||
name: version,
|
||||
tag_name: version,
|
||||
description: changelog,
|
||||
commitish: "master"
|
||||
)
|
||||
pod_push(allow_warnings: false, verbose: true)
|
||||
sh("git fetch --tags")
|
||||
pod_push(allow_warnings: true, verbose: true)
|
||||
end
|
||||
end
|
||||
|
||||
+13
-27
@@ -1,43 +1,29 @@
|
||||
fastlane documentation
|
||||
----
|
||||
|
||||
================
|
||||
# Installation
|
||||
|
||||
Make sure you have the latest version of the Xcode command line tools installed:
|
||||
|
||||
```sh
|
||||
```
|
||||
xcode-select --install
|
||||
```
|
||||
|
||||
For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
|
||||
Install _fastlane_ using
|
||||
```
|
||||
[sudo] gem install fastlane -NV
|
||||
```
|
||||
or alternatively using `brew cask install fastlane`
|
||||
|
||||
# Available Actions
|
||||
|
||||
### test
|
||||
|
||||
```sh
|
||||
[bundle exec] fastlane test
|
||||
```
|
||||
|
||||
Run tests
|
||||
|
||||
----
|
||||
|
||||
|
||||
## iOS
|
||||
|
||||
### ios release
|
||||
|
||||
```sh
|
||||
[bundle exec] fastlane ios release
|
||||
```
|
||||
|
||||
Deploy new version
|
||||
fastlane ios release
|
||||
```
|
||||
Depoy new version
|
||||
|
||||
----
|
||||
|
||||
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
|
||||
|
||||
More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
|
||||
|
||||
The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
|
||||
This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
|
||||
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
|
||||
The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
|
||||
|
||||
Executable
+4
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
bundle install
|
||||
bundle exec fastlane release
|
||||
Reference in New Issue
Block a user