Compare commits

...

355 Commits

Author SHA1 Message Date
Kristaps Grinbergs 4534f9ca29 Merge branch 'master' into xcode-10
# Conflicts:
#	Sources/Starscream/WebSocket.swift
#	Starscream.xcodeproj/project.pbxproj
2018-11-13 14:19:27 +02:00
Kristaps Grinbergs 5527c29d21 Merge pull request #577 from ollitapa/xcode-10
Expose path viability and better path updates
2018-11-12 16:18:22 +02:00
Kristaps Grinbergs bc6c868641 Merge pull request #583 from mooshee/patch-1
Wrap Network import with `canImport`
2018-10-29 15:53:11 +02:00
Kristaps Grinbergs 9b942131d5 Merge pull request #590 from sirlantis/patch-1
Don't add empty Sec-WebSocket-Protocol header
2018-10-29 15:04:45 +02:00
Marcel Jackwerth 108aa5e4c8 Don't add empty Sec-WebSocket-Protocol header
> The request MAY include a header field with the name
> |Sec-WebSocket-Protocol|.  If present, this value indicates one
> or more comma-separated subprotocol the client wishes to speak,
> ordered by preference.
> 
> -- The WebSocket Protocol (https://tools.ietf.org/html/rfc6455)

Passing an empty / neutral array should be the same as passing `nil` here.
The WebSocket API (in Browsers) also seems to treat `null` and `[]` the same.

Preferably the initializer signature should be `protocols: [String] = []`,
but that would make this a breaking change.
2018-10-29 13:13:25 +01:00
Daniel Hallman 0b10d3e21e Wrap Network import with canImport 2018-10-17 15:16:43 -04:00
Olli Tapaninen a109616d95 Fix pass through 2018-10-14 23:32:33 +03:00
Olli Tapaninen 5f6b4d235f Weak delegate 2018-10-11 09:06:01 +03:00
Kristaps Grinbergs c72659bd32 Added 3.0.6 to changelog 2018-10-10 15:08:57 +03:00
Olli Tapaninen c0123b373c Expose path viability and better path updates 2018-10-10 09:21:45 +03:00
Kristaps Grinbergs ebdc260ea6 Merge pull request #572 from daltoniam/self_swift_4.2
Using s = self in Swift 4.2 way
2018-10-09 11:42:07 +03:00
Kristaps Grinbergs 361a905d30 Using s = self in Swift 4.2 way 2018-10-08 20:19:36 +03:00
Kristaps Grinbergs 0f18ae5959 Merge pull request #570 from vonox7/patch-1
Add onHttpResponseHeaders callback. Fixes #567
2018-10-08 19:42:58 +03:00
Kristaps Grinbergs 82a01218cc Merge pull request #569 from daltoniam/release_action
Release action with fastlane
2018-10-08 19:36:51 +03:00
Valentin Slawicek 46d8cacb2e Add onHttpResponseHeaders callback. Fixes #567 2018-10-08 17:54:04 +02:00
Kristaps Grinbergs 2280423c21 Release action with fastlane 2018-10-08 18:42:48 +03:00
Kristaps Grinbergs 2022e6f553 Merge pull request #568 from daltoniam/swift_4.2
Swift 4.2 and example project
2018-10-08 18:12:31 +03:00
Kristaps Grinbergs b0729b1181 Added build.sh file 2018-10-08 18:10:25 +03:00
Kristaps Grinbergs fd8a3fc3fa Clean up example project 2018-10-08 17:59:34 +03:00
Kristaps Grinbergs f58389b4ff Remove test project as submodule 2018-10-08 17:55:36 +03:00
Kristaps Grinbergs 4b28929ae5 Swift 4.2 and example project
* Swift 4.2 support
* version bump in podspec
* example version with websockets.org echo example
* remove deprecated .swift-version
2018-10-08 17:36:51 +03:00
Kristaps Grinbergs 384b8039ef Merge pull request #559 from turbulem/pr_520
Move CommonCrypto and zlib dependencies mapping to custom module map
2018-10-08 16:57:58 +03:00
Kristaps Grinbergs c70d18f03d Merge pull request #564 from fb55/patch-1
Add pongDelegate to WebSocketClient protocol
2018-10-04 21:57:27 +03:00
Felix Böhm 813d92d917 Add pongDelegate to WebSocketClient protocol
currently blocking https://github.com/RxSwiftCommunity/RxStarscream/pull/23
2018-10-04 12:53:54 +01:00
Sergey Lem c6dfbf1ccb Update podspec, return old code for sha1, update project settings 2018-10-02 11:28:24 +01:00
Sergey Lem e22724f5cf Remove no longer needed dependencies from SPM config 2018-10-01 11:52:33 +01:00
Sergey Lem dceb95c4ea Remove custom module maps for CC and zlib, use system-provided ones 2018-10-01 11:44:36 +01:00
Sergey Lem c3b05cde30 Squashed commit of the following:
commit 467334e818
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Fri Sep 28 10:47:53 2018 +0100

    Remove old file

commit 631c25645a
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Fri Sep 28 09:51:15 2018 +0100

    Fix project settings

commit d629a65c20
Merge: 6371914 7f12731
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Wed Sep 26 14:58:20 2018 +0100

    Merge branch 'master' of github.com:turbulem/Starscream

    # Conflicts:
    #	Starscream.xcodeproj/project.pbxproj

commit 637191444a
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Mon Sep 10 09:45:21 2018 +0100

    Add NSString+SHA1 to test target

commit 33846d16f5
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Mon Sep 10 09:40:09 2018 +0100

    Fix project inclusion and add missing linker flag

commit 74e3c637e5
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Wed Jul 25 10:47:16 2018 +0100

    Pull master branch from daltoniam/Starscream

commit 912e7da6a1
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Thu Jun 28 11:30:51 2018 +0100

    Fix return type for SHA1 digest and cast warning

commit 70234bc6bb
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Mon Jun 25 13:18:18 2018 +0100

    Add custom wrapper for SHA1 and custom modulemap for framework including module maps for CommonCrypto and zlib

commit 94f8d58d0b
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Thu Jun 14 18:52:14 2018 +0100

    Move CommonCrypto and zlib dependencies mapping to private module map

commit 7f12731d14
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Mon Sep 10 09:45:21 2018 +0100

    Add NSString+SHA1 to test target

commit 8df9d1ebf9
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Mon Sep 10 09:40:09 2018 +0100

    Fix project inclusion and add missing linker flag

commit bd0732e53b
Merge: 138cfa7 70fd033
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Wed Jul 25 10:48:22 2018 +0100

    Merge branch 'master'

    # Conflicts:
    #	Starscream.xcodeproj/project.pbxproj

commit 138cfa76a3
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Wed Jul 25 10:47:16 2018 +0100

    Pull master branch from daltoniam/Starscream

commit ca783dbcae
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Thu Jun 28 11:30:51 2018 +0100

    Fix return type for SHA1 digest and cast warning

commit 8ca8df0edc
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Mon Jun 25 13:18:18 2018 +0100

    Add custom wrapper for SHA1 and custom modulemap for framework including module maps for CommonCrypto and zlib

commit 98e1d6207c
Author: Sergey Lem <lemsergey@gmail.com>
Date:   Thu Jun 14 18:52:14 2018 +0100

    Move CommonCrypto and zlib dependencies mapping to private module map
2018-09-28 13:20:22 +01:00
daltoniam d14d4af2e7 Merge branch 'xcode-10' of https://github.com/daltoniam/starscream into xcode-10 2018-09-25 11:46:44 -05:00
daltoniam ed6eee4155 fixed conflict with package manager changes 2018-09-25 11:46:32 -05:00
Dalton 79cd8a2a89 Merge pull request #556 from nuclearace/spm-4
update to swift 4 manifest
2018-09-25 10:58:35 -05:00
Dalton b59d3e1512 Merge pull request #540 from fassko/xcode-10
Set availability also for tvOS and macOS - Xcode10
2018-09-25 10:36:34 -05:00
Erik Little a403aea07e update to swift 4 manifest 2018-09-23 09:41:41 -04:00
Kristaps Grinbergs 69a0180e2c Set availability also for tvOS and macOS 2018-08-01 11:21:04 +03:00
daltoniam 12cdf2bce2 general refactor and Network.framework support 2018-07-27 17:16:11 -05:00
Dalton 70fd033db6 Merge pull request #527 from brian-dlee/master
Documents `disconnect` behavior in README
2018-07-20 16:50:59 -05:00
Dalton d2bf71599a Merge pull request #522 from MaherKSantina/master
Fixed typo in Readme
2018-07-20 16:49:59 -05:00
Dalton 09297799cc Merge pull request #507 from eliburke/master
added open keyword to SSLSecurity.isValid, added public to other methods
2018-07-20 16:48:48 -05:00
Dalton b111e1a8f0 Merge pull request #481 from MuniekMg/master
Client Side Authentication Added
2018-07-20 16:44:26 -05:00
Dalton 451480d86f Merge pull request #524 from adamkaplan/fix-crash-nil-outstream
Fix crash nil outstream
2018-07-20 16:41:39 -05:00
Brian Lee 9811225d21 Documents disconnect behavior in README 2018-06-25 15:41:34 -07:00
Adam Kaplan cfd37a6f08 Fix Xcode 10 error on unsafe access in test 2018-06-21 11:49:13 -04:00
Adam Kaplan c89a127289 Prevent a crash if Websocket output stream is gone 2018-06-21 11:45:29 -04:00
Maher Santina 6a2a3a7c36 Fixed typo 2018-06-21 18:32:03 +10:00
Maher Santina 8266c80b85 Fixed typo 2018-06-21 18:30:37 +10:00
Eli Burke d8278d951a added keyword public to SSLSecurity.certificateChain, publicKeyChain, extractPublicKey 2018-04-24 10:18:30 -04:00
Eli Burke 0f2ee9f68e change SSLSecurity.isValid from public to open 2018-04-24 09:58:53 -04:00
Tomasz Trela 8b9c52eec3 cosmetic changes to match original code 2018-04-07 19:43:02 +02:00
Tomasz Trela 073aa863cd prints changes to throw error 2018-04-07 19:39:42 +02:00
Tomasz Trela cd185b6fe9 Removed conflicts and unnecessary useSSLClientAuthentication varialbe 2018-04-07 18:50:35 +02:00
daltoniam 114e5df9b6 Merge branch 'master' of https://github.com/daltoniam/Starscream 2018-04-04 13:16:29 -05:00
daltoniam 430bfc32c3 a few small bug fixes and swift 4.1 support 2018-04-04 13:16:20 -05:00
MuniekMg 1edb4c0b65 Documantations fixed 2018-03-10 11:54:24 +01:00
MuniekMg 157291cb5e Client Side Authentication Added 2018-03-09 18:45:32 +01:00
Austin Cherry 31f522155a Merge pull request #461 from rastersize/remove-cartfile
Remove Cartfile as the checkout is unused
2018-02-19 17:22:33 -06:00
Aron Cedercrantz 327a7d8e9e Remove Cartfile as the checkout is unused 2018-01-30 18:04:11 -05:00
daltoniam 6e10c04c83 bumped spec. Updated CHANGELOG 2018-01-13 19:14:22 -06:00
daltoniam 97401e04bc Merge branch 'master' of https://github.com/daltoniam/Starscream 2018-01-13 18:56:36 -06:00
Dalton 6ba3563148 Merge pull request #452 from victorg1991/master
Enable editing Host header value
2018-01-13 18:56:27 -06:00
daltoniam 146368c71a new error handling. Timeout fix. Assorted fixes 2018-01-13 18:53:59 -06:00
Victor Galan 4ea6f4be3a Enable editing Host header value 2018-01-11 17:20:04 +01:00
daltoniam 6cb1c474e0 watchos, forgot about that one 2017-12-08 13:56:15 -06:00
daltoniam 7102d31afb watchos, forgot about that one 2017-12-08 13:53:31 -06:00
daltoniam 0f94bb3d95 spec 2017-12-08 13:46:43 -06:00
daltoniam 28070bf2a4 bumped spec 2017-12-08 13:40:21 -06:00
daltoniam ee0c7f9213 Merge branch 'master' of https://github.com/daltoniam/Starscream 2017-12-08 13:06:52 -06:00
daltoniam a49c7e2119 bug fixes 2017-12-08 13:06:50 -06:00
Dalton 7fad6b3a82 Merge pull request #438 from BlakeBarrett/patch-1
Update README.md
2017-12-08 13:04:32 -06:00
Dalton 06baac0fe7 Merge pull request #423 from neoneye/master
enableSOCKSProxy - See websocket traffic in Charles proxy
2017-12-08 13:04:16 -06:00
Blake Barrett 5866676617 Update README.md
Fix a typo in one of the code samples.
2017-12-07 16:44:04 -08:00
Simon Strandgaard b074c6c833 I was unable to see any websocket traffic in Charles proxy. In order to enable websocket inspection I applied the snippet by https://github.com/kevinmlong that is mentioned here: https://github.com/daltoniam/Starscream/issues/240 2017-11-15 15:58:36 +01:00
Dalton 8f2af31bd3 Merge pull request #418 from frederik-jacques/master
Fix warning for Swift 4 on the use of `character` property
2017-11-08 12:51:17 -06:00
Dalton d3fb769f93 Merge pull request #420 from fjcaetano/fix/deployment_target
Fix: tvOS framework deployment target
2017-11-08 12:47:36 -06:00
Flávio Caetano f58eb4ccad Fix: tvOS framework deployment target
fix #419
2017-11-07 17:35:35 -02:00
Frederik Jacques 880b5b4c9e Fix warning for Swift 4 on the use of character property 2017-11-07 09:37:00 +01:00
Dalton 97e378d94a Merge pull request #405 from hishnash/sendPong
Expose Pong Control frames
2017-11-06 12:58:32 -06:00
Dalton ca20b02ca2 Merge pull request #410 from qiuncheng/master
Fixed #409 When url contains query, server cannot get query parameters.
2017-11-06 12:57:18 -06:00
Dalton a1f133d737 Merge pull request #412 from eliburke/master
improved handling for self-signed certificate validation
2017-11-06 12:56:56 -06:00
Eli Burke 13f685f464 add flag to SSLSecurity implementation to turn off full cert chain checks. The
existing code would not work in cases where a CA cert was trusted, and the web
site used a signed leaf certificate. default behavior is unchanged
2017-10-31 11:41:41 -04:00
Eli Burke fae7ef2817 preserve original behavior when desiredTrustHostname is set to nil or "" 2017-10-23 09:45:19 -04:00
Eli Burke b24eaba135 separate self-signed from cert name override
add a 2nd method of getting the remote host domain name
2017-10-20 16:29:25 -04:00
qiuncheng e8182190b7 Fixed #409 When url contains query, server cannot get query parameters. 2017-10-17 14:22:22 +08:00
Dalton bf24825167 Merge pull request #400 from fassko/ISSUE_399
Fixes #399 String.characters.count deprecation warning in Xcode 9.1
2017-10-16 12:50:57 -05:00
Dalton 9ee57e089d Merge pull request #404 from rastersize/patch-1
Fix version number in changelog
2017-10-16 12:49:39 -05:00
Matthaus Woolard f057a8b33d Expose Pong Control frames
* Let users send Pong frames
* let users turn off automatic Ping responds with Pong. (only needed are edge cases)
2017-10-16 08:43:15 +03:00
Aron Cedercrantz b8fe0f64e3 Fix version number in changelog 2017-10-13 15:02:06 -04:00
Kristaps Grinbergs 94e54af61c Fixes #399
String.characters.count deprecation warnings
2017-10-09 16:40:15 +03:00
daltoniam 44ce58956f handle trailing slash better. bumped version 2017-10-04 21:54:22 -05:00
daltoniam c7cc1db0e3 fix for servers disliking not having a trailing slash. #394, #392 2017-10-02 13:08:10 -05:00
daltoniam a438ea1977 added armv7k 2017-09-27 15:12:41 -05:00
daltoniam b5991eda48 version update 2017-09-27 13:42:09 -05:00
Dalton 0a6f6d2a79 Merge pull request #388 from nuclearace/fix-http-headers
HTTP headers are case insensitive
2017-09-27 13:37:51 -05:00
Dalton 3fdf33a078 Merge pull request #390 from xjbeta/Fix-Deployment
Add macOS Deployment Target.
2017-09-27 13:36:04 -05:00
xjbeta 9f5f0f44f9 Add macOS Deployment Target. 2017-09-27 14:12:42 +08:00
Erik Little da7949d2da HTTP headers are case insensitive 2017-09-26 13:12:43 -04:00
Dalton dc48916804 Merge pull request #386 from lukkas/missing-arm64
add missing arm64
2017-09-26 11:51:03 -05:00
Lukasz Kasperek e0e8271725 add missing armv7 2017-09-26 15:57:04 +02:00
Lukasz Kasperek 411820d836 add missing arm64 2017-09-26 14:56:33 +02:00
daltoniam d326d448b0 pod spec update for new folder name 2017-09-25 16:29:15 -05:00
daltoniam 7dd90900dc merged the swift 4 branch 2017-09-25 16:22:33 -05:00
daltoniam f506be54ae refactor and swift4 2017-09-25 16:00:28 -05:00
Dalton 143ab16c1a Merge pull request #377 from hamchapman/two-targets-one-scheme
Reduce to two targets and a single scheme
2017-09-22 13:17:03 -05:00
Hamilton Chapman 4d281416c2 Reduce to two targets and a single scheme 2017-09-05 10:30:55 +01:00
Dalton e9d10000ec Merge pull request #372 from jcesarmobile/patch-1
Use Swift 4
2017-09-02 14:33:58 -05:00
Austin Cherry 789264eeff Merge pull request #375 from nremond/patch-1
Typo in README.md
2017-08-31 11:29:00 -05:00
Nicolas Rémond 644e8f92c0 Typo in README.md 2017-08-31 10:49:34 +02:00
jcesarmobile 68b64ede4e Use Swift 4
update .swift-version file to use Swift 4
2017-08-23 11:06:25 +02:00
daltoniam 31277a418c swift4 project file update 2017-08-19 17:23:58 -05:00
daltoniam 21678c9426 syntax fail 2017-08-19 17:03:45 -05:00
daltoniam acbf665b3d syntax fail 2017-08-19 17:01:00 -05:00
daltoniam e99deb9af8 changelog 2017-08-19 16:59:41 -05:00
daltoniam 6dc9cdffbc bumped spec 2017-08-19 16:50:40 -05:00
daltoniam ef4ed1b2f9 Merge branch 'master' of https://github.com/daltoniam/Starscream 2017-08-14 21:53:03 -05:00
daltoniam 3401fb25f4 fix for possible race condition 2017-08-14 21:53:00 -05:00
Dalton daa97005e6 Merge pull request #364 from nuclearace/master
Namespace zlib and common crypto
2017-08-14 21:52:14 -05:00
Erik Little 008302326b Namespace zlib and common crypto 2017-07-28 17:00:49 -04:00
Dalton d7c41e513f Merge pull request #357 from slk333/patch-2
typo
2017-07-28 14:15:47 -05:00
Dalton 92816513c3 Merge pull request #355 from danielrhammond/fix-segfault
Fix race on connected
2017-07-28 14:15:31 -05:00
slk333 6c9f76e7ea typo 2017-07-13 01:56:33 +02:00
Daniel Hammond 4d6dce3d64 Fix race on connected
doDisconnect(_:) gets called from a background thread as part of the operation queued in dequeueWrite(_,code:completion:) when a connection failure triggers this code it produces a race between all the reads of isConnected and that write on a different queue.
2017-07-10 13:23:06 -07:00
Dalton b0ed1decce Merge pull request #331 from winsmith/master
Added docs and error message for SSL Cipher Suites
2017-07-07 15:29:11 -05:00
daltoniam 86310e7bbc updated podspec 2017-07-07 15:18:08 -05:00
daltoniam 7edfb2ad85 the joys of getting all the package manager to play nice 2017-07-07 14:38:47 -05:00
Daniel Jilg 1efe3ce798 Merge branch 'master' into master 2017-07-05 09:44:12 +02:00
Daniel Jilg 624a5cc6c3 Removed Else Clause that would sometimes give a wrong error message
This reverts parts of commit 87dbce07ea.
2017-07-05 09:42:27 +02:00
daltoniam 09b9136ef0 updated changelog 2017-06-29 17:48:36 -05:00
daltoniam 5434be279c updated pod spec for compression changes 2017-06-29 17:46:31 -05:00
Dalton 08edd54a40 Merge pull request #349 from giullo/Fix-SSL-Pinning-Crash
SecTrust object now is conditionally unwrapped
2017-06-29 17:44:18 -05:00
Giuliano Galea 8623fe8b9e SecTrust object now is conditionally unwrapped 2017-06-27 10:29:29 +02:00
daltoniam fa85b9c61c spm fix 2017-06-24 19:09:03 -05:00
daltoniam 6e9a33a854 spm fix 2017-06-24 18:55:53 -05:00
daltoniam b5e68fceae package manager update 2017-06-24 18:13:24 -05:00
daltoniam 601ef74ca4 fixes #309, #319, #334 2017-06-24 18:09:48 -05:00
Dalton 7e517c246b Merge pull request #337 from hishnash/AdvancedDelegate
Add Advanced Delegate and Custom HTTP methods
2017-06-24 14:54:36 -05:00
Dalton bb11123729 Merge pull request #344 from wittedhaddock/patch-1
Update README with (trite) grammar changes
2017-06-24 14:46:35 -05:00
Dalton 7bf478ce94 Merge pull request #339 from junelife/compression
Support websocket compression
2017-06-24 14:45:25 -05:00
Matthaus Woolard bce64dabfa make WSResponse values public 2017-06-18 14:02:12 +03:00
Matthaus Woolard 3104c289e9 Add Advanced Delegate and Custom HTTP methods
Added the `WebSocketAdvancedDelegate` protocol that optionaly replaces the `WebSocketDelegate` adding support for:

* More detail when getting data (exposes the WSFrame object to the delegate)
* More detail about the HTTP request and response so that the user can extract needed information.

Also added support for custom HTTP methods for the http request.
2017-06-18 12:08:07 +03:00
James Graham f35266534a Update README with (trite) grammar changes 2017-06-06 10:46:07 -04:00
Joseph Ross 44fdfa3791 Include zlib as a module, rather than using @_silgen_name and redefinition. This is less verbose and less error-prone. 2017-05-25 14:23:07 -07:00
Joseph Ross 35fc161193 Add information about compression support to README. Other changes based on PR feedback. 2017-05-25 10:24:51 -07:00
Joseph Ross 45546818fb Avoid unnecessary copying. Confirm Autobahn fuzzing test results are comparable with the autobahn library itself. 2017-05-24 17:17:12 -07:00
Joseph Ross 19793796bb Fix capture memory leaks in Autobahn tester. 2017-05-24 13:39:06 -07:00
Joseph Ross 4ba077ee4b Fixes to handle different windowsBits and noContextTakeover. 2017-05-24 13:06:37 -07:00
Joseph Ross ca85642c21 Integrate compression classes. 2017-05-24 12:01:43 -07:00
Joseph Ross ccc9c4ea43 Add compression classes and unit tests. 2017-05-24 07:38:03 -07:00
Dalton 02718e7a45 Merge pull request #333 from nuclearace/master
Remove void parameter from onConnect, Swift4 would require passi…
2017-05-23 13:39:55 -05:00
Erik 961fd34f3d Remove void parameter from onConnect, Swift4 would require passing () into it 2017-05-20 21:40:38 -04:00
Daniel Jilg 87dbce07ea Add docs for SSL Cipher Suites 2017-05-04 15:44:26 +02:00
Dalton ee993322c1 Merge pull request #320 from RaghavMangrola/master
Swift Package Manager Installation Instructions
2017-03-28 20:15:52 -05:00
daltoniam 85070aab91 few warning fixes 2017-03-28 20:09:07 -05:00
Raghav Mangrola 07351dcb77 Swift Package Manager Installation Instructions 2017-03-19 16:11:13 -07:00
daltoniam dbeb1190b8 some cleanup and SSL pinning fix 2017-03-14 13:12:39 -05:00
daltoniam 13859364e3 updated changelog 2017-02-03 14:25:31 -06:00
daltoniam 41c0c5e08b version bump 2017-02-03 14:20:21 -06:00
daltoniam 60b27a4388 possible fix for #301 2017-01-11 22:55:39 -06:00
daltoniam a68bf7c35b connect delegate before firing message delegates. Fixed disconnect getting called before connect 2017-01-11 12:10:33 -06:00
Dalton 33a4551f3b Merge pull request #302 from Elethier/operation-cancellation
Fixed issues with not cancelling block operations properly
2017-01-10 22:25:12 -06:00
Dalton b22fae407e Merge pull request #300 from Elethier/multiple-disconnects
Added guard against multiple disconnects
2017-01-10 21:41:02 -06:00
Dalton e9160df255 Merge pull request #296 from nuclearace/fix-disconnect
Fix #295
2017-01-06 21:32:13 -06:00
Praneet Sahgal c63e173021 Fixed issues with not cancelling block operations properly 2017-01-04 09:15:56 -06:00
Praneet Sahgal ddcc30d200 Added guard against multiple disconnects 2017-01-04 09:03:42 -06:00
Erik 6bacb6f972 Fix #295
This sets didDisconnect to false if we receive a connect.
2016-12-31 18:05:11 -05:00
Dalton aca2ad5332 Merge pull request #292 from euskadi31/master
Change public to open
2016-12-30 16:32:51 -06:00
Dalton 3ba1963c65 Merge pull request #294 from wordpress-mobile/prevent-reconnection-crash
Prevent reconnection crash
2016-12-30 15:56:12 -06:00
Dalton 3cc4a60e05 Merge pull request #289 from robinmj/master
Fix for excessive memory use caused by the receipt of an unusually large message
2016-12-30 15:54:37 -06:00
Jorge Bernal 14313df360 Disconnect and clean up streams before connecting.
Since `disconnect` without a timeout only sends a close message to the server,
if we tried to `connect` the socket again before the connection was closed it
would not clean up the streams properly, which could result in a crash.

See #272
2016-12-27 16:23:39 +01:00
Jorge Bernal 162c1d53b8 Keep isConnecting true while connecting.
The existing code only prevented a second connection to be created while
createHTTPRequest was being called (setting up the HTTP request and the
streams). However, between the time when the socket opens the streams until the
TCP handshake ends, it would be both `!conneted` and `!isConnecting`, which
wouldn't prevent a second `connect`.
2016-12-27 15:56:01 +01:00
Axel Etcheverry b404f98244 Change public to open 2016-12-19 15:31:10 +01:00
daltoniam 8d0c0c1afa simple test update 2016-12-12 13:26:41 -06:00
Dalton 816fe413a4 Merge pull request #288 from dancasimiro/host-only-origin
Remove the path components from the URL sent as origin
2016-12-12 13:22:27 -06:00
Daniel C. Casimiro 5cc0d860ba Add path components to the test server URL
This demonstrates the path stripping from the origin URL.
2016-11-22 08:53:45 -05:00
Daniel C. Casimiro 4d2f8dbfee Remove the path components from the URL sent as origin
This fixes issue #287. The origin is a URI indicating the server from
which the request initiated. It does not include any path information,
but only the server name.
2016-11-22 08:53:45 -05:00
Robin Johnson 126c021e61 fixed malloc failure by draining autorelease pool with every dequeuing operation 2016-11-21 19:14:20 -07:00
daltoniam c13584b99c bumped spec 2016-11-14 22:29:34 -06:00
Dalton 178c3e8a49 Merge pull request #277 from nuclearace/master
Fix Swift package manager
2016-11-01 18:57:49 -05:00
Erik ccc1b703dd Fix Swift package manager 2016-10-30 19:47:58 -04:00
daltoniam 1b64f78542 version bump 2016-10-26 20:41:30 -05:00
Dalton 549500a503 Merge pull request #253 from noremac/master
Only disable SSL cert validation if we are using a secure scheme.
2016-10-26 20:26:58 -05:00
Dalton 22d57dca07 Merge pull request #276 from profer/master
Enable custom trust validation
2016-10-26 20:26:30 -05:00
daltoniam dd5119cfce fix for #261 2016-10-26 20:25:39 -05:00
Wolfgang Profer a6b2e4329b Enable custom trust validation
Change WebSocket to use a protocol for trust validation instead of SSLSecurity directly. This allows users of Starscream to supply their own validation logic.
2016-10-24 13:43:44 +02:00
Dalton 931e3ba8ae Merge pull request #266 from fjcaetano/master
'Open'ing classes
2016-10-11 23:23:09 -05:00
Dalton 7476f5196e Merge pull request #267 from Dipak99041012/2.0.0HotFixes
[Fixup] crash for SSL Pinning Strange crash
2016-10-11 23:20:28 -05:00
Dipak Kasabwala 20285cce97 [Fixup] crash for SSL Pinning Strange crash 2016-10-10 18:14:01 -04:00
Flávio Caetano 8e1de1d475 'Open'ing classes 2016-10-10 17:47:13 -03:00
Cameron Pulsford acf64adc24 Only disable SSL cert validation if we are using a secure scheme. 2016-09-30 14:49:26 -04:00
Dalton b0fa08cde4 Merge pull request #259 from robinkunde/master
Improve clarity of asyncAfter code and other timeout
2016-09-30 13:34:49 -05:00
Dalton 9d32864ab4 Merge pull request #260 from ujell/master
Fixed parameter names in documentation
2016-09-30 13:02:28 -05:00
Yücel Uzun 7ef2bc41e0 Fixed parameter names in documentation 2016-09-29 18:50:22 +02:00
Robin Kunde 24e32a78e3 improve clarity of asyncAfter code and other timeout 2016-09-28 12:27:48 -04:00
daltoniam d831901ff4 more things to get cocoapods working 2016-09-18 16:35:32 -05:00
daltoniam 26b03ddaef swift 3 support 2016-09-18 16:28:53 -05:00
daltoniam d94c3ff3b4 cocoapods... 2016-09-18 16:18:21 -05:00
daltoniam 60d853742c cocoapods... 2016-09-18 16:16:37 -05:00
daltoniam 8563f6b85e osx podspec update 2016-09-18 16:13:23 -05:00
daltoniam c889a6c977 available for osx 2016-09-18 16:07:39 -05:00
daltoniam 8f3761215b conflict fixes 2016-09-18 15:46:05 -05:00
daltoniam cdf8caeb1a swift 2.3 update 2016-09-18 15:43:12 -05:00
daltoniam 00d8fae6cd swift3 updates 2016-09-18 15:37:55 -05:00
Dalton 46db9a75f0 Merge pull request #243 from cpinski/writeQueueQOS
Added initializer to set the QOS of the write queue
2016-09-13 21:21:48 -05:00
Christopher Pinski 5a3adc7756 Added initializer to set the QOS of the write queue 2016-08-29 15:44:05 -05:00
Austin Cherry b1472f2a99 Merge pull request #242 from pvzig/xcode8b6
Xcode8b6
2016-08-28 13:15:57 -07:00
Peter Zignego 34ed785564 Update example test syntax 2016-08-28 11:26:03 -04:00
Peter Zignego 08d2da1221 Set SWIFT_VERSION for all targets 2016-08-28 11:25:52 -04:00
Dalton 5c607a80ce Merge pull request #235 from nuclearace/swift3-nuclearace
Beta6 update
2016-08-22 13:30:48 -07:00
Erik 3aac891e83 Merge dalton/master and update for swift3 2016-08-21 17:07:07 -04:00
Dalton 32fb0aa87e Merge pull request #230 from cpinski/swift2.3
Adding full support for swift 2.3
2016-08-14 15:21:25 -07:00
Dalton 473a1382ac Merge pull request #227 from tractus/swift3
Updated for Xcode 8 Beta 4
2016-08-08 17:41:39 -07:00
Christopher Pinski 9c210e006e Adding full support for swift 2.3 2016-08-05 10:47:12 -05:00
Dalton c767cb2a54 Merge pull request #225 from ThinkChaos/master
Fix typo that prevents SSL detection
2016-08-03 14:57:31 -07:00
Trey Richards cdd1224a71 Updated for Xcode 8 Beta 4 2016-08-02 15:30:56 -07:00
ThinkChaos 7c09aa08b4 Fix typo that prevents SSL detection 2016-07-31 10:18:00 +02:00
Dalton c2782b5452 Merge pull request #222 from Danappelxx/swift3
Fix typo in `dequeueInput`
2016-07-21 14:42:02 -07:00
Dan Appel 14bc9ad90f Fix typo in dequeueInput
This was breaking messages that were sent in chunks, since only the first chunk would be processed.
2016-07-20 18:51:58 -07:00
Dalton bdab51f4af Merge pull request #219 from nathanborror/master
Fixing 'queue' naming error
2016-07-12 18:39:42 -07:00
Nathan Borror 26297ed3c1 Fixing 'queue' naming error 2016-07-12 15:57:03 -07:00
Dalton 600815b240 Merge pull request #211 from Abeansits/master
Fixed formatting on a a few places to be more consistent.
2016-07-08 23:00:32 -07:00
Sebastian Nystorm 5fba5b83b4 Fixed formatting on a a few places to be more consistent.
Renamed a few vars to be more descriptive.
Added some MARKS to divide the code inte clearer chunks.
Also fixed a few spelling mistakes.
2016-07-03 22:19:08 -07:00
Dalton c39043cc29 Merge pull request #209 from Abeansits/master
Returned custom close reason from server according to RFC 6455
2016-06-24 19:35:44 -07:00
Sebastian Nystorm dd6bfa24b7 Returned custom close reason from server according to RFC 6455 2016-06-23 12:26:07 -07:00
daltoniam 64661bc6ce Merge branch 'master' of https://github.com/daltoniam/Starscream 2016-06-18 19:23:02 -07:00
daltoniam 0f03fab95d swift 3 branch README note 2016-06-18 19:22:45 -07:00
daltoniam c7b52b4485 swift 3 changes to build with xCode 8. More cleanup staged 2016-06-18 19:20:26 -07:00
Dalton fc35de78a5 Merge pull request #199 from dreymonde/notifications
Posting NSNotification about websocket connection and disconnection
2016-06-02 20:41:52 -07:00
Oleg Dreyman d911dc1adf README update to include information about NSNotifications 2016-05-29 20:19:55 +03:00
Oleg Dreyman f5f777c507 Posting errors with userInfo on WebsocketDidDisconnectNotification 2016-05-28 01:37:26 +03:00
Oleg Dreyman cca4af6112 Posting NSNotification about websocket connection and disconnection 2016-05-28 01:16:03 +03:00
daltoniam afad19ca84 changes for swift 3 2016-05-21 21:16:59 -07:00
daltoniam b159d03640 fixes #185 2016-05-16 22:27:51 -07:00
daltoniam d5aeefd853 switch from recusion to loop 2016-05-16 22:01:20 -07:00
Dalton f0f2ceee20 Merge pull request #189 from mayoff/upstream
process buffered messages non-recursively
2016-05-16 18:51:47 -07:00
Rob Mayoff 10cfb16197 process buffered messages non-recursively 2016-05-11 15:37:14 -05:00
daltoniam bf0146db26 1.1.3 release 2016-03-31 12:25:30 -07:00
Austin Cherry cf6def9453 Merge pull request #178 from noremac/dev/cameron.pulsford/write-complete
Adds an optional `writeCompletion` callback
2016-03-01 10:59:39 -08:00
Cameron Pulsford 8db1a45c6c Adds an optional "write did complete" callback 2016-03-01 09:24:16 -05:00
Austin Cherry 592da86d06 Merge pull request #177 from noremac/dev/cameron.pulsford/var-let
Replaces a force-unwrapped var with a let
2016-02-29 23:07:41 -08:00
Cameron Pulsford 43ade49abe Replaces a force-unwrapped NSData var with a let 2016-02-29 00:18:35 -05:00
Dalton e32674a1ea Merge pull request #175 from impossibleventures/master
Set "Require Only App-Extension-Safe API" to YES
2016-02-25 12:56:44 -08:00
Ryan Peck 7e49eb2458 Set APPLICATION_EXTENSION_API_ONLY = YES 2016-02-24 18:27:11 -06:00
Dalton 53c19d2388 Merge pull request #174 from nicolasbigot/master
Remove `var` parameters to conform to Swift 3
2016-02-24 11:42:36 -08:00
Nicolas Bigot ab02d55700 Fix comments spaces 2016-02-24 09:58:09 +01:00
Nicolas Bigot fa0865fcac Remove var parameters to conform to Swift 3 2016-02-24 09:55:23 +01:00
Dalton 5d185b41cb Merge pull request #171 from ReadmeCritic/master
Correct the spelling of CocoaPods in README
2016-02-12 18:19:34 -08:00
ReadmeCritic ba1d7db873 Correct the spelling of CocoaPods in README 2016-02-12 15:47:14 -08:00
Dalton e2eea95ea5 Merge pull request #170 from mayoff/master
change all use of ++ to += 1
2016-02-11 10:43:14 -08:00
Rob Mayoff 363e331a84 change all use of ++ to += 1
Swift 2.2 deprecates ++ and --, and Swift 3 will remove them.
2016-02-11 11:59:27 -06:00
daltoniam 75721192c9 Merge branch 'master' of https://github.com/daltoniam/Starscream 2016-02-08 19:04:10 -08:00
daltoniam 0c4a99588f bumped version 2016-02-08 19:03:41 -08:00
Dalton 4387f497c9 Merge pull request #167 from ayking/master
fix : connect to a shutdown server will not get error call back
2016-02-08 18:57:00 -08:00
Dalton d87b422950 Merge pull request #168 from onevcat/master
Fix crashing when reconnecting repeatedly
2016-02-08 18:55:26 -08:00
onevcat c5569dff12 Fix crashing when reconnecting repeatedly 2016-02-08 22:40:11 +08:00
Alan YU 6b303eafec fix : connect to a shutdown server will not get error call back 2016-02-05 17:12:33 +08:00
daltoniam 0f8dd95f70 proper fix for #164 2016-01-29 10:52:18 -08:00
daltoniam ede7c9aa89 Merge branch 'master' of https://github.com/daltoniam/Starscream 2016-01-27 21:39:38 -08:00
daltoniam afefdff061 fixes for #158, #159, #161, #164 2016-01-27 21:39:13 -08:00
Dalton 3a59333bac Merge pull request #160 from kylebshr/master
Simple update to examples for Swift 2 (println() to print())
2016-01-22 13:19:41 -08:00
Kyle Bashour 1951d74516 Simple update to examples for Swift 2 (println() to print()) 2016-01-22 13:00:04 -05:00
daltoniam 6c34076224 another possible fix for #158 2016-01-21 15:44:51 -08:00
daltoniam f189e7c51f possible fix for #158 2016-01-21 13:46:52 -08:00
daltoniam 95c91f9dbf changelog update 2016-01-18 12:34:43 -08:00
daltoniam 398d9c15bf bumped spec 2016-01-18 12:26:32 -08:00
Dalton 5a85e4e524 Merge pull request #157 from dsato80/fragBuffer-fix
set fragBuffer data if processHTTP returns -1
2016-01-18 12:15:57 -08:00
Daisuke Sato d6f2c2c409 set fragBuffer data if processHTTP returns -1 2016-01-18 18:10:30 +09:00
daltoniam ad91b8f1f3 shared queue and bug fixes 2016-01-17 22:39:41 -08:00
daltoniam c59125f34a fixes #139 2016-01-13 18:20:41 -08:00
daltoniam ce9062ab81 fixes #149 2016-01-13 18:16:37 -08:00
Dalton ff64f0b349 Merge pull request #152 from steven851007/master
Fix #151
2016-01-11 15:27:09 -08:00
Istvan Balogh 65dbee5c94 Add default value to origin to keep backward compatibility 2016-01-09 10:53:14 +01:00
Istvan Balogh 7927195b05 Fix #151 2015-12-25 11:19:09 +01:00
Dalton d32dcb2aaa Merge pull request #144 from JamesPrudente/master
call websocketDidConnect delegate after connected is set to prevent race condition
2015-12-23 15:03:49 -08:00
Dalton aeae316209 Merge pull request #146 from mstorsjo/avoid-unaligned
Avoid doing unaligned reads/writes via UnsafePointer
2015-12-12 20:22:57 +02:00
Martin Storsjö 4f2201d6b7 Avoid doing unaligned reads/writes via UnsafePointer
Instead read/write individual bytes via UnsafePointer<UInt8>.

This fixes crashes that only happen when optimization is turned on,
on 32 bit arm builds.

Not all processors support unaligned reads/writes of 64 bit values.
Without optimizations, the reads/writes probably end up handling one
byte at a time (like this commit makes it do), while higher
optimization levels convert it to single reads/writes of the full
size, which may require that the pointer is properly aligned.
2015-12-11 20:39:03 +02:00
James Prudente ec313a376e call websocketDidConnect delegate after connected is set to prevent race condition 2015-12-10 16:05:07 -08:00
Dalton d5f690123f Merge pull request #141 from delba/syntax
Syntax
2015-12-07 11:37:30 -08:00
delba b00a84716c Use implicit casting 2015-12-07 18:41:19 +01:00
delba aa11fd3bbe Use guard 2015-12-07 18:39:58 +01:00
delba b6dddff56c Use if-let optional unwrapping 2015-12-07 18:29:22 +01:00
delba ac4f5ced1e Use contains 2015-12-07 18:24:32 +01:00
delba 947601b673 Initialize OpCode from rawValue 2015-12-07 18:15:11 +01:00
delba cea6ce13c8 Remove unneccessary parentheses around conditions 2015-12-07 18:15:11 +01:00
delba 09c032a138 Use reduce 2015-12-07 18:15:11 +01:00
delba 3fe7363ee9 Use an optional parameter 2015-12-07 18:15:11 +01:00
delba 32925e3847 Use the optional method call syntax 2015-12-07 18:15:11 +01:00
delba 6ad98fb458 Use the for-i-in-range syntax 2015-12-07 18:15:11 +01:00
delba f02840355d Use the trailing closure syntax 2015-12-07 18:15:11 +01:00
delba 4bece17d89 Use the shorthand notation for Array and Dictionary 2015-12-07 18:15:11 +01:00
Dalton 3582bab0b8 Merge pull request #140 from markus-k/master
Unwrap header safely when validating response.
2015-11-24 09:58:22 -08:00
Dalton 737fca6e73 Merge pull request #138 from Abizern/error-codes
Make CloseCode enum public
2015-11-24 09:52:38 -08:00
Markus Kasten e9446a57cd Unwrap header safely when validating response.
App will crash otherwise, when the header is missing.
2015-11-24 11:53:02 +01:00
Abizer Nasir b6054567ee Create a WebSocket error domain
Saves using strings, and also the domain of the error can be switched against.
2015-11-22 00:14:52 +00:00
Abizer Nasir 2b8d6214e2 Make CloseCode enum public
Since they get passed to the websocketDidDisconnect delegate method,
making them public means that the codes can be switched against without
needing magic numbers.
2015-11-21 23:59:45 +00:00
Dalton c56e0104c3 Merge pull request #135 from simonbs/master
Sets UIRequiredDeviceCapabilities in tvOS target
2015-11-16 11:10:31 -08:00
Dalton 2bbc0895d6 Merge pull request #133 from mayoff/maintenance-1.0.2
clean up WebSocket.disconnect parameter
2015-11-16 11:10:05 -08:00
Simon Støvring f1acef9a5f Sets UIRequiredDeviceCapabilities in tvOS target 2015-11-16 18:51:41 +01:00
Rob Mayoff b29059a937 clean up WebSocket.disconnect parameter
Now the parameter is properly an Optional<NSTimeInterval>, nil means no timeout, and zero means close immediately and forcibly.
2015-11-12 21:02:02 -06:00
Dalton e1bbc7612e added license to source files 2015-11-12 11:40:48 -08:00
Dalton e10942bc23 bumped spec 2015-11-05 10:09:45 -08:00
Dalton 9cf2c1f787 framework and package managers 2015-11-05 10:03:19 -08:00
Dalton bc48e654ca fixed tvOS build settings 2015-11-04 15:02:51 -08:00
Dalton 5e2768c048 possible fix for #132 2015-11-04 13:18:00 -08:00
Dalton 756a42756a Merge branch 'master' of https://github.com/daltoniam/Starscream 2015-10-20 18:51:17 -07:00
Dalton 4442aed401 added force timeout option for #127 2015-10-20 18:51:10 -07:00
Dalton 5f4db02f99 Merge pull request #129 from OlivierBoucher/master
Added tvOS target and podspec modifications
2015-10-20 18:46:09 -07:00
Olivier Boucher 679d858bbb Added tvOS target and podspec modifications 2015-10-20 09:16:21 -04:00
Dalton ec32edfb4e README update 2015-10-13 19:20:01 -07:00
Dalton df98a6e363 changelog and README update 2015-10-12 12:06:54 -07:00
Dalton 47bcdfbe57 bumped spec 2015-09-29 12:59:38 -07:00
Austin Cherry d69b169970 Merge pull request #125 from victorluft/master
When using cert pinning with public keys, only require one match.
2015-09-29 11:57:43 -07:00
Victor Luft aa2cb1b8fb When using cert pinning with public keys, only require one match. 2015-09-29 10:34:26 -07:00
Dalton fe2c26b760 fix for #121. Possible fix for upgrade issue 2015-09-28 10:29:36 -07:00
Dalton 357cd532dc example updates and fix #119 2015-09-28 10:14:36 -07:00
Dalton e0e4b379e7 Merge pull request #110 from TeletronicsDotAe/master
Property for enabling only certain cipher suites for the WSS connection
2015-09-22 10:28:03 -07:00
Pelle Stenild Coltau 4c66b22b43 Changes made regarding CipherSuites with respect to pull request review comments: Removed NSLog and doDisconnect() and added return statements in failure scenarios. 2015-09-21 11:27:14 +04:00
Pelle Stenild Coltau e848f186a5 Merge remote-tracking branch 'upstream/master' 2015-09-20 12:32:39 +04:00
Dalton c8201ec71c README update 2015-09-18 10:40:21 -07:00
Dalton f990c68c53 fixed conflicts 2015-09-14 09:56:30 -07:00
Dalton 9d37723c4d ready to become the master 2015-09-14 09:49:33 -07:00
Dalton b32048b229 ready to become the master 2015-09-14 09:47:31 -07:00
Dalton a40f448a16 quick README update 2015-09-14 09:32:49 -07:00
Dalton dcb046a46c bumped podspec 2015-09-14 09:26:01 -07:00
Dalton 357a178a64 last quick fix for #113 2015-09-14 09:24:45 -07:00
Dalton 7a15d7d7e6 fix for #113 2015-09-11 10:52:07 -07:00
Dalton 13f7502163 cleanup for Swift 2 2015-09-10 17:17:42 -07:00
Dalton 2e5cb03ac3 fix for #115 2015-09-10 15:59:29 -07:00
Dalton b26ffa28cd fix for #115 2015-09-10 15:57:34 -07:00
Dalton fd18936144 write queue change 2015-09-04 15:14:43 -07:00
Dalton e30b9a6f78 updated podspec 2015-09-04 13:33:40 -07:00
Dalton b962e3e532 fixed conflicts 2015-09-04 13:30:52 -07:00
Dalton 889d2880eb switch from unowned to weak 2015-09-04 13:21:28 -07:00
Dalton f509d9d485 updated podspec 2015-09-03 20:09:45 -07:00
Dalton 7b46baf12b better 2015-09-03 20:06:41 -07:00
Dalton 5dfe1fc117 added master fixes 2015-09-03 20:05:33 -07:00
Dalton f46e64b179 fix for #109, #105 and socket.io-swift 153 2015-09-03 19:59:26 -07:00
Pelle Stenild Coltau 4d072de18d Added optional unwrapping to cipher suites in case there is no ssl context 2015-08-30 11:22:39 +04:00
Leif Bredgaard Honore f0b188606f Revert "Better error handling of missing SSLContext"
This reverts commit fac69339ba.
2015-08-30 09:10:40 +04:00
Leif Bredgaard Honore fac69339ba Better error handling of missing SSLContext 2015-08-27 14:38:25 +04:00
Leif Bredgaard Honore e2c3e38a23 Bug fixed 2015-08-27 11:12:56 +04:00
Leif Bredgaard Honore 5f46a9097e Improved cipher suite error handling
We check the error code from SSLSetEnabledCiphers() and fail if it does
not succeed.
2015-08-26 14:06:43 +04:00
Leif Bredgaard Honore 8376a9c70b Cypher suite property renamed 2015-08-26 11:14:08 +04:00
Dalton 02f8eac43b Merge pull request #108 from FanVox/xcode7_b6
Make compatible with Xcode7 b5
2015-08-25 10:49:25 -07:00
Abizer Nasir 6a318b29d2 Make compatible with Xcode7 b5 2015-08-25 17:30:35 +01:00
Leif Bredgaard Honore df88d97511 It is now possible to set which SSL Cipher Suites are enabled for a connection 2015-08-24 14:21:05 +04:00
Austin ca478d26b2 fixed conflicts 2015-08-12 19:12:29 -07:00
Austin d1f3deee70 fix for #103 2015-08-12 10:33:32 -07:00
Dalton 4b65324a8d Merge pull request #102 from Ewg777/Swift-2.0
xcode 7 beta 5 compatibility
2015-08-07 13:31:16 -07:00
Ewg 9663215089 xcode 7 beta 5 compatibility 2015-08-07 13:13:35 +03:00
Ewg 5d272a80ef xcode 7 beta 5 compatibility 2015-08-07 13:12:48 +03:00
Dalton 56fb313bc5 added test autobahn project 2015-08-04 10:34:45 -07:00
Dalton e39ddeecf5 Merge pull request #101 from col/Swift-2.0
Xcode 7 / iOS 9 beta 4 compatibility
2015-07-22 10:38:22 -07:00
Colin Harris 36d4426888 Modified the Security class to make it compatible with Xcode 7 / iOS9 beta 4 2015-07-23 01:15:24 +08:00
Dalton 7b19d84984 fixes for #98 and #99. Closures are way more awesome. Possible fix for #87, #77 and fix for #72 2015-07-09 18:41:45 -07:00
Dalton b3db9d413a fix for #92 2015-06-14 19:47:09 -07:00
Dalton a69929fbc1 Merge pull request #95 from ricardopereira/Swift-2.0
Swift 2.0 update
2015-06-10 13:36:29 -07:00
Ricardo Pereira 3178fb1705 #93 Converted to latest swift syntax 2015-06-10 11:58:10 +01:00
85 changed files with 5812 additions and 1702 deletions
+93 -2
View File
@@ -4,7 +4,7 @@
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
#
# Pods/
Pods/
# Xcode
.DS_Store
@@ -24,4 +24,95 @@ DerivedData
.idea/
*.hmap
*.xccheckout
*.xcodeproj/*.xcworkspace
*.xcodeproj/*.xcworkspace
# Created by https://www.gitignore.io/api/swift,swiftpm
### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/
DerivedData/
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/
## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM
## Playgrounds
timeline.xctimeline
playground.xcworkspace
# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output
# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode
iOSInjectionProject/
### SwiftPM ###
Packages
xcuserdata
*.xcodeproj
# End of https://www.gitignore.io/api/swift,swiftpm
+7
View File
@@ -0,0 +1,7 @@
osx_image: xcode10
language: objective-c
before_install:
- gem install cocoapods --pre
- gem cleanup
script:
- ./build.sh
+223
View File
@@ -0,0 +1,223 @@
# Change Log
All notable changes to this project will be documented in this file.
`Starscream` adheres to [Semantic Versioning](http://semver.org/).
#### [3.0.6](https://github.com/daltoniam/Starscream/tree/3.0.6)
* Swift 4.2 and Xcode 10 support
* added pongDelegate
* moved CommonCrypto and zlib dependencies
* HTTP proxy support
#### [3.0.5](https://github.com/daltoniam/Starscream/tree/3.0.5)
Swift 4.1 support and bug fixes.
Pull Requests:
[#492](https://github.com/daltoniam/Starscream/pull/492)
[#461](https://github.com/daltoniam/Starscream/pull/461)
[#476](https://github.com/daltoniam/Starscream/pull/476)
Issues:
[#494](https://github.com/daltoniam/Starscream/issues/494)
[#491](https://github.com/daltoniam/Starscream/issues/491)
[#474](https://github.com/daltoniam/Starscream/issues/474)
[#471](https://github.com/daltoniam/Starscream/issues/471)
[#437](https://github.com/daltoniam/Starscream/issues/437)
[#445](https://github.com/daltoniam/Starscream/issues/445)
[#466](https://github.com/daltoniam/Starscream/issues/466)
#### [3.0.4](https://github.com/daltoniam/Starscream/tree/3.0.4)
Improved error handling. Timeout fix. Small assorted fixes.
Pull Requests:
[#452](https://github.com/daltoniam/Starscream/pull/452)
[#448](https://github.com/daltoniam/Starscream/pull/448)
[#444](https://github.com/daltoniam/Starscream/pull/444)
[#443](https://github.com/daltoniam/Starscream/pull/443)
Issues:
[#415](https://github.com/daltoniam/Starscream/issues/415)
[#422](https://github.com/daltoniam/Starscream/issues/422)
[#429](https://github.com/daltoniam/Starscream/issues/429)
[#433](https://github.com/daltoniam/Starscream/issues/433)
[#439](https://github.com/daltoniam/Starscream/issues/439)
#### [3.0.3](https://github.com/daltoniam/Starscream/tree/3.0.3)
Assorted fixes.
Pull Requests:
[#438](https://github.com/daltoniam/Starscream/pull/438)
[#423](https://github.com/daltoniam/Starscream/pull/423)
[#420](https://github.com/daltoniam/Starscream/pull/420)
[#418](https://github.com/daltoniam/Starscream/pull/418)
[#410](https://github.com/daltoniam/Starscream/pull/410)
[#405](https://github.com/daltoniam/Starscream/pull/405)
[#404](https://github.com/daltoniam/Starscream/pull/404)
[#400](https://github.com/daltoniam/Starscream/pull/400)
Issues:
[#435](https://github.com/daltoniam/Starscream/issues/435)
[#431](https://github.com/daltoniam/Starscream/issues/431)
[#426](https://github.com/daltoniam/Starscream/issues/426)
[#409](https://github.com/daltoniam/Starscream/issues/409)
[#408](https://github.com/daltoniam/Starscream/issues/408)
[#401](https://github.com/daltoniam/Starscream/issues/401)
[#399](https://github.com/daltoniam/Starscream/issues/399)
[#378](https://github.com/daltoniam/Starscream/issues/378)
#### [3.0.2](https://github.com/daltoniam/Starscream/tree/3.0.2)
Small fixes for 3.0.1.
[#394](https://github.com/daltoniam/Starscream/issues/394)
[#392](https://github.com/daltoniam/Starscream/issues/392)
[#391](https://github.com/daltoniam/Starscream/issues/391)
#### [3.0.1](https://github.com/daltoniam/Starscream/tree/3.0.1)
Small fixes for 3.0.0.
[#389](https://github.com/daltoniam/Starscream/issues/389)
[#354](https://github.com/daltoniam/Starscream/issues/354)
[#386](https://github.com/daltoniam/Starscream/pull/386)
[#388](https://github.com/daltoniam/Starscream/pull/388)
[#390](https://github.com/daltoniam/Starscream/pull/390)
#### [3.0.0](https://github.com/daltoniam/Starscream/tree/3.0.0)
Major refactor and Swift 4 support. Additions include:
- Watchos support.
- Linux support.
- New Stream class to allow custom socket implementations if desired.
- Protocol added for mocking (dependency injection).
- Single framework (no more platform suffixes! e.g. StarscreamOSX, StarscreamTVOS, etc).
[#384](https://github.com/daltoniam/Starscream/issues/384)
[#377](https://github.com/daltoniam/Starscream/pull/377)
[#374](https://github.com/daltoniam/Starscream/issues/374)
[#346](https://github.com/daltoniam/Starscream/issues/346)
[#335](https://github.com/daltoniam/Starscream/issues/335)
[#311](https://github.com/daltoniam/Starscream/pull/311)
[#269](https://github.com/daltoniam/Starscream/issues/269)
#### [2.1.1](https://github.com/daltoniam/Starscream/tree/2.1.1)
Fixes race condition. Updated to avoid SPM dependencies.
[#370](https://github.com/daltoniam/Starscream/issues/370)
[#367](https://github.com/daltoniam/Starscream/issues/367)
[#364](https://github.com/daltoniam/Starscream/pull/364)
[#357](https://github.com/daltoniam/Starscream/pull/357)
[#355](https://github.com/daltoniam/Starscream/pull/355)
#### [2.1.0](https://github.com/daltoniam/Starscream/tree/2.1.0)
Adds WebSocket compression. Also adds advance WebSocket delegate for extra control. Bug Fixes.
[#349](https://github.com/daltoniam/Starscream/pull/349)
[#344](https://github.com/daltoniam/Starscream/pull/344)
[#339](https://github.com/daltoniam/Starscream/pull/339)
[#337](https://github.com/daltoniam/Starscream/pull/337)
[#334](https://github.com/daltoniam/Starscream/issues/334)
[#333](https://github.com/daltoniam/Starscream/pull/333)
[#319](https://github.com/daltoniam/Starscream/issues/319)
[#309](https://github.com/daltoniam/Starscream/issues/309)
[#329](https://github.com/daltoniam/Starscream/issues/329)
#### [2.0.4](https://github.com/daltoniam/Starscream/tree/2.0.4)
SSL Pinning fix by Giuliano Galea as reported by Lukas Futera of [Centralway](https://www.centralway.com/de/).
Warning fixes for Swift 3.1
#### [2.0.3](https://github.com/daltoniam/Starscream/tree/2.0.3)
[#302](https://github.com/daltoniam/Starscream/issues/302)
[#301](https://github.com/daltoniam/Starscream/issues/301)
[#300](https://github.com/daltoniam/Starscream/issues/300)
[#296](https://github.com/daltoniam/Starscream/issues/296)
[#294](https://github.com/daltoniam/Starscream/issues/294)
[#292](https://github.com/daltoniam/Starscream/issues/292)
[#289](https://github.com/daltoniam/Starscream/issues/289)
[#288](https://github.com/daltoniam/Starscream/issues/288)
#### [2.0.2](https://github.com/daltoniam/Starscream/tree/2.0.2)
Fix for the Swift Package Manager.
Fixed:
[#277](https://github.com/daltoniam/Starscream/issues/277)
#### [2.0.1](https://github.com/daltoniam/Starscream/tree/2.0.1)
Bug fixes.
Fixed:
[#261](https://github.com/daltoniam/Starscream/issues/261)
[#276](https://github.com/daltoniam/Starscream/issues/276)
[#267](https://github.com/daltoniam/Starscream/issues/267)
[#266](https://github.com/daltoniam/Starscream/issues/266)
[#259](https://github.com/daltoniam/Starscream/issues/259)
#### [2.0.0](https://github.com/daltoniam/Starscream/tree/2.0.0)
Added Swift 3 support.
Fixed:
[#229](https://github.com/daltoniam/Starscream/issues/229)
[#232](https://github.com/daltoniam/Starscream/issues/232)
#### [1.1.4](https://github.com/daltoniam/Starscream/tree/1.1.4)
Swift 2.3 support.
#### [1.1.3](https://github.com/daltoniam/Starscream/tree/1.1.3)
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)
[#177](https://github.com/daltoniam/Starscream/issues/177)
[#178](https://github.com/daltoniam/Starscream/issues/178)
#### [1.1.2](https://github.com/daltoniam/Starscream/tree/1.1.2)
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:
[#157](https://github.com/daltoniam/Starscream/issues/157)
#### [1.1.0](https://github.com/daltoniam/Starscream/tree/1.1.0)
Changed:
Moved over to Runloop/default GCD queues to shared queue.
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)
[#149](https://github.com/daltoniam/Starscream/issues/149)
[#147](https://github.com/daltoniam/Starscream/issues/147)
[#139](https://github.com/daltoniam/Starscream/issues/139)
[#77](https://github.com/daltoniam/Starscream/issues/77)
#### [1.0.2](https://github.com/daltoniam/Starscream/tree/1.0.2)
Added TVOS support.
#### [1.0.1](https://github.com/daltoniam/Starscream/tree/1.0.1)
Fixes for #121, #123
#### [1.0.0](https://github.com/daltoniam/Starscream/tree/1.0.0)
first release of Swift 2 support.
+4
View File
@@ -0,0 +1,4 @@
source "https://rubygems.org"
gem "fastlane"
gem "cocoapods", ">= 1.6.0.beta.1"
+201
View File
@@ -0,0 +1,201 @@
GEM
remote: https://rubygems.org/
specs:
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)
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.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-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.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.2)
xcodeproj (>= 1.6.0, < 2.0)
cocoapods-core (1.6.0.beta.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.1)
cocoapods-plugins (1.0.0)
nap
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.1.0)
colored (1.2)
colored2 (3.1.2)
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.5.0)
emoji_regex (0.1.1)
escape (0.0.4)
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_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.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (~> 0.1)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.24.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
multi_json
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.2.2, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.6.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-api-client (0.23.9)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
googleauth (0.6.6)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.1.0)
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.0)
netrc (0.11.0)
os (1.0.0)
plist (3.4.0)
public_suffix (2.0.5)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rouge (2.0.7)
ruby-macho (1.3.1)
rubyzip (1.2.2)
security (0.1.3)
signet (0.10.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.5)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (1.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tty-cursor (0.6.0)
tty-screen (0.6.5)
tty-spinner (0.8.0)
tty-cursor (>= 0.5.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
word_wrap (1.0.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.2.6)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.0)
xcpretty (~> 0.2, >= 0.0.7)
PLATFORMS
ruby
DEPENDENCIES
cocoapods (>= 1.6.0.beta.1)
fastlane
BUNDLED WITH
1.16.1
+4 -29
View File
@@ -1,7 +1,9 @@
Apache License
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.
@@ -171,31 +173,4 @@ Apache License
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.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner}
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.
of your accepting any such warranty or additional liability.
+8
View File
@@ -0,0 +1,8 @@
{
"object": {
"pins": [
]
},
"version": 1
}
+34
View File
@@ -0,0 +1,34 @@
// swift-tools-version:4.2
//
// Package.Swift
// Starscream
//
// Created by Dalton Cherry on 5/16/15.
// Copyright (c) 2014-2016 Dalton Cherry.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import PackageDescription
let package = Package(
name: "Starscream",
products: [
.library(name: "Starscream", targets: ["Starscream"])
],
dependencies: [],
targets: [
.target(name: "Starscream")
]
)
+211 -58
View File
@@ -1,16 +1,15 @@
![starscream](http://limitedtoy.com/wp-content/uploads/2014/09/transformers-starscream-wallpaperstarscream-transformers-2-wallpaper---332913-pnx7lnff.jpg)
![starscream](https://raw.githubusercontent.com/daltoniam/starscream/assets/starscream.jpg)
Starscream is a conforming WebSocket ([RFC 6455](http://tools.ietf.org/html/rfc6455)) client library in Swift for iOS and OSX.
It's Objective-C counter part can be found here: [Jetfire](https://github.com/acmacalister/jetfire)
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](http://autobahn.ws/testsuite/).
- Nonblocking. Everything happens in the background, thanks to GCD.
- Simple delegate pattern design.
- TLS/WSS support.
- Compression Extensions support ([RFC 7692](https://tools.ietf.org/html/rfc7692))
- Simple concise codebase at just a few hundred LOC.
## Example
@@ -21,10 +20,10 @@ First thing is to import the framework. See the Installation instructions on how
import Starscream
```
Once imported, you can open a connection to your WebSocket server. Note that `socket` is probably best as a property, so your delegate can stick around.
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 socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"))
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
socket.delegate = self
socket.connect()
```
@@ -36,8 +35,8 @@ After you are connected, there are some delegate methods that we need to impleme
websocketDidConnect is called as soon as the client connects to the server.
```swift
func websocketDidConnect(socket: WebSocket) {
println("websocket is connected")
func websocketDidConnect(socket: WebSocketClient) {
print("websocket is connected")
}
```
@@ -46,8 +45,8 @@ func websocketDidConnect(socket: WebSocket) {
websocketDidDisconnect is called as soon as the client is disconnected from the server.
```swift
func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
println("websocket is disconnected: \(error?.localizedDescription)")
func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
print("websocket is disconnected: \(error?.localizedDescription)")
}
```
@@ -56,8 +55,8 @@ func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
websocketDidReceiveMessage is called when the client gets a text frame from the connection.
```swift
func websocketDidReceiveMessage(socket: WebSocket, text: String) {
println("got some text: \(text)")
func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
print("got some text: \(text)")
}
```
@@ -66,8 +65,8 @@ func websocketDidReceiveMessage(socket: WebSocket, text: String) {
websocketDidReceiveData is called when the client gets a binary frame from the connection.
```swift
func websocketDidReceiveData(socket: WebSocket, data: NSData) {
println("got some data: \(data.length)")
func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
print("got some data: \(data.count)")
}
```
@@ -76,43 +75,95 @@ func websocketDidReceiveData(socket: WebSocket, data: NSData) {
websocketDidReceivePong is called when the client gets a pong response from the connection. You need to implement the WebSocketPongDelegate protocol and set an additional delegate, eg: ` socket.pongDelegate = self`
```swift
func websocketDidReceivePong(socket: WebSocket) {
println("Got pong!")
func websocketDidReceivePong(socket: WebSocketClient, data: Data?) {
print("Got pong! Maybe some data: \(data?.count)")
}
```
## The delegate methods give you a simple way to handle data from the server, but how do you send data?
### writeData
The writeData method gives you a simple way to send `NSData` (binary) data to the server.
Or you can use closures.
```swift
self.socket.writeData(data) //write some NSData over the socket!
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()
```
### writeString
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
The writeData method gives you a simple way to send `Data` (binary) data to the server.
```swift
socket.write(data: data) //write some Data over the socket!
```
### write a string frame
The writeString method is the same as writeData, but sends text/string.
```swift
self.socket.writeString("Hi Server!") //example on how to write text over the socket!
socket.write(string: "Hi Server!") //example on how to write text over the socket!
```
### writePing
### write a ping frame
The writePing method is the same as writeData, but sends a ping control frame.
The writePing method is the same as write, but sends a ping control frame.
```swift
self.socket.writePing(NSData()) //example on how to write a ping control frame over the socket!
socket.write(ping: Data()) //example on how to write a ping control frame over the socket!
```
### write a pong frame
the writePong method is the same as writePing, but sends a pong control frame.
```swift
socket.write(pong: Data()) //example on how to write a pong control frame over the socket!
```
Starscream will automatically respond to incoming `ping` control frames so you do not need to manually send `pong`s.
However if for some reason you need to control this process you can turn off the automatic `ping` response by disabling `respondToPingWithPong`.
```swift
socket.respondToPingWithPong = false //Do not automaticaly respond to incoming pings with pongs.
```
In most cases you will not need to do this.
### disconnect
The disconnect method does what you would expect and closes the socket.
```swift
self.socket.disconnect()
socket.disconnect()
```
The socket can be forcefully closed, by specifying a timeout (in milliseconds). A timeout of zero will also close the socket immediately without waiting on the server.
```swift
socket.disconnect(forceTimeout: 10, closeCode: CloseCode.normal.rawValue)
```
### isConnected
@@ -120,7 +171,7 @@ self.socket.disconnect()
Returns if the socket is connected or not.
```swift
if self.socket.isConnected {
if socket.isConnected {
// do cool stuff.
}
```
@@ -130,9 +181,23 @@ if self.socket.isConnected {
You can also override the default websocket headers with your own custom ones like so:
```swift
socket.headers["Sec-WebSocket-Protocol"] = "someother protocols"
socket.headers["Sec-WebSocket-Version"] = "14"
socket.headers["My-Awesome-Header"] = "Everything is Awesome!"
var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
request.timeoutInterval = 5
request.setValue("someother protocols", forHTTPHeaderField: "Sec-WebSocket-Protocol")
request.setValue("14", forHTTPHeaderField: "Sec-WebSocket-Version")
request.setValue("Everything is Awesome!", forHTTPHeaderField: "My-Awesome-Header")
let socket = WebSocket(request: request)
```
### Custom HTTP Method
Your server may use a different HTTP method when connecting to the websocket:
```swift
var request = URLRequest(url: URL(string: "ws://localhost:8080/")!)
request.httpMethod = "POST"
request.timeoutInterval = 5
let socket = WebSocket(request: request)
```
### Protocols
@@ -141,45 +206,64 @@ If you need to specify a protocol, simple add it to the init:
```swift
//chat and superchat are the example protocols here
var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"), protocols: ["chat","superchat"])
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
socket.delegate = self
socket.connect()
```
### Self Signed SSL and VOIP
There are a couple of other properties that modify the stream:
### Self Signed SSL
```swift
var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"), protocols: ["chat","superchat"])
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
//set this if you are planning on using the socket in a VOIP background setting (using the background VOIP service).
socket.voipEnabled = true
//set this you want to ignore SSL cert validation, so a self signed SSL certificate can be used.
socket.selfSignedSSL = true
//set this if you want to ignore SSL cert validation, so a self signed SSL certificate can be used.
socket.disableSSLCertValidation = true
```
### SSL Pinning
SSL Pinning is also supported in Starscream.
SSL Pinning is also supported in Starscream.
```swift
var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"), protocols: ["chat","superchat"])
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
let data = ... //load your certificate from disk
socket.security = Security(certs: [SSLCert(data: data)], usePublicKeys: true)
//socket.security = Security() //uses the .cer files in your app's bundle
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 `NSData` blob of your certificate or you can use a `SecKeyRef` if you have a public key you want to use. The `usePublicKeys` bool is whether to use the certificates for validation or the public keys. The public keys will be extracted from the certificates automatically if `usePublicKeys` is choosen.
You load either a `Data` blob of your certificate or you can use a `SecKeyRef` if you have a public key you want to use. The `usePublicKeys` bool is whether to use the certificates for validation or the public keys. The public keys will be extracted from the certificates automatically if `usePublicKeys` is choosen.
### SSL Cipher Suites
To use an SSL encrypted connection, you need to tell Starscream about the cipher suites your server supports.
```swift
socket = WebSocket(url: URL(string: "wss://localhost:8080/")!, protocols: ["chat","superchat"])
// Set enabled cipher suites to AES 256 and AES 128
socket.enabledSSLCipherSuites = [TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256]
```
If you don't know which cipher suites are supported by your server, you can try pointing [SSL Labs](https://www.ssllabs.com/ssltest/) at it and checking the results.
### Compression Extensions
Compression Extensions ([RFC 7692](https://tools.ietf.org/html/rfc7692)) is supported in Starscream. Compression is enabled by default, however compression will only be used if it is supported by the server as well. You may enable or disable compression via the `.enableCompression` property:
```swift
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!)
socket.enableCompression = false
```
Compression should be disabled if your application is transmitting already-compressed, random, or other uncompressable data.
### Custom Queue
A custom queue can be specified when delegate methods are called. By default `dispatch_get_main_queue` is used, thus making all delegate methods calls run on the main thread. It is important to note that all WebSocket processing is done on a background thread, only the delegate method calls are changed when modifying the queue. The actual processing is always on a background thread and will not pause your app.
A custom queue can be specified when delegate methods are called. By default `DispatchQueue.main` is used, thus making all delegate methods calls run on the main thread. It is important to note that all WebSocket processing is done on a background thread, only the delegate method calls are changed when modifying the queue. The actual processing is always on a background thread and will not pause your app.
```swift
var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/"), protocols: ["chat","superchat"])
socket = WebSocket(url: URL(string: "ws://localhost:8080/")!, protocols: ["chat","superchat"])
//create a custom queue
socket.queue = dispatch_queue_create("com.vluxe.starscream.myapp", nil)
socket.callbackQueue = DispatchQueue(label: "com.vluxe.starscream.myapp")
```
## Example Project
@@ -188,21 +272,21 @@ Check out the SimpleTest project in the examples directory to see how to setup a
## Requirements
Starscream works with iOS 7/OSX 10.9 or above. It is recommended to use iOS 8/10.10 or above for Cocoapods/framework support.
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
### Cocoapods
### CocoaPods
Check out [Get Started](http://cocoapods.org/) tab on [cocoapods.org](http://cocoapods.org/).
To use Starscream in your project add the following 'Podfile' to your project
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
use_frameworks!
pod 'Starscream', '~> 0.9.2'
pod 'Starscream', '~> 3.0.2'
Then run:
@@ -214,6 +298,19 @@ Check out the [Carthage](https://github.com/Carthage/Carthage) docs on how to ad
[Carthage Install](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application)
You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
```bash
$ brew update
$ brew install carthage
```
To integrate Starscream into your Xcode project using Carthage, specify it in your `Cartfile`:
```
github "daltoniam/Starscream" >= 3.0.2
```
### Rogue
First see the [installation docs](https://github.com/acmacalister/Rogue) for how to install Rogue.
@@ -221,11 +318,23 @@ First see the [installation docs](https://github.com/acmacalister/Rogue) for how
To install Starscream run the command below in the directory you created the rogue file.
```
rogue add https://github.com/daltoniam/starscream
rogue add https://github.com/daltoniam/Starscream
```
Next open the `libs` folder and add the `Starscream.xcodeproj` to your Xcode project. Once that is complete, in your "Build Phases" add the `Starscream.framework` to your "Link Binary with Libraries" phase. Make sure to add the `libs` folder to your `.gitignore` file.
### Swift Package Manager
The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler.
Once you have your Swift package set up, adding Starscream as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
```swift
dependencies: [
.Package(url: "https://github.com/daltoniam/Starscream.git", majorVersion: 3)
]
```
### Other
Simply grab the framework (either via git submodule or another package manager).
@@ -236,10 +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
- [ ] Complete Docs
- [ ] Add Unit Tests
- [ ] Add Unit Tests - Local WebSocket server that runs against Autobahn
## License
-244
View File
@@ -1,244 +0,0 @@
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// Security.swift
// Starscream
//
// Created by Dalton Cherry on 5/16/15.
// Copyright (c) 2015 Vluxe. All rights reserved.
//
//////////////////////////////////////////////////////////////////////////////////////////////////
import Foundation
import Security
public class SSLCert {
var certData: NSData?
var key: SecKeyRef?
/**
Designated init for certificates
:param: data is the binary data of the certificate
:returns: a representation security object to be used with
*/
public init(data: NSData) {
self.certData = data
}
/**
Designated init for public keys
:param: key is the public key to be used
:returns: a representation security object to be used with
*/
public init(key: SecKeyRef) {
self.key = key
}
}
public class Security {
public var validatedDN = true //should the domain name be validated?
var isReady = false //is the key processing done?
var certificates: [NSData]? //the certificates
var pubKeys: [SecKeyRef]? //the public keys
var usePublicKeys = false //use public keys or certificate validation?
/**
Use certs from main app bundle
:param: usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning validation
:returns: a representation security object to be used with
*/
public convenience init(usePublicKeys: Bool = false) {
let paths = NSBundle.mainBundle().pathsForResourcesOfType("cer", inDirectory: ".")
var collect = Array<SSLCert>()
for path in paths {
if let d = NSData(contentsOfFile: path as! String) {
collect.append(SSLCert(data: d))
}
}
self.init(certs:collect, usePublicKeys: usePublicKeys)
}
/**
Designated init
:param: keys is the certificates or public keys to use
:param: usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning validation
:returns: a representation security object to be used with
*/
public init(certs: [SSLCert], usePublicKeys: Bool) {
self.usePublicKeys = usePublicKeys
if self.usePublicKeys {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), {
var collect = Array<SecKeyRef>()
for cert in certs {
if let data = cert.certData where cert.key == nil {
cert.key = self.extractPublicKey(data)
}
if let k = cert.key {
collect.append(k)
}
}
self.pubKeys = collect
self.isReady = true
})
} else {
var collect = Array<NSData>()
for cert in certs {
if let d = cert.certData {
collect.append(d)
}
}
self.certificates = collect
self.isReady = true
}
}
/**
Valid the trust and domain name.
:param: trust is the serverTrust to validate
:param: domain is the CN domain to validate
:returns: if the key was successfully validated
*/
public func isValid(trust: SecTrustRef, domain: String?) -> Bool {
var tries = 0
while(!self.isReady) {
usleep(1000)
tries += 1
if tries > 5 {
return false //doesn't appear it is going to ever be ready...
}
}
var policy: SecPolicyRef
if self.validatedDN {
policy = SecPolicyCreateSSL(1, domain).takeRetainedValue()
} else {
policy = SecPolicyCreateBasicX509().takeRetainedValue()
}
SecTrustSetPolicies(trust,policy)
if self.usePublicKeys {
if let keys = self.pubKeys {
var trustedCount = 0
let serverPubKeys = publicKeyChainForTrust(trust)
for serverKey in serverPubKeys as [AnyObject] {
for key in keys as [AnyObject] {
if serverKey.isEqual(key) {
trustedCount++
break
}
}
}
if trustedCount == serverPubKeys.count {
return true
}
}
} else if let certs = self.certificates {
let serverCerts = certificateChainForTrust(trust)
var collect = Array<SecCertificate>()
for cert in certs {
collect.append(SecCertificateCreateWithData(nil,cert).takeRetainedValue())
}
SecTrustSetAnchorCertificates(trust,collect)
var result: SecTrustResultType = 0
SecTrustEvaluate(trust,&result)
let r = Int(result)
if r == kSecTrustResultUnspecified || r == kSecTrustResultProceed {
var trustedCount = 0
for serverCert in serverCerts {
for cert in certs {
if cert == serverCert {
trustedCount++
break
}
}
}
if trustedCount == serverCerts.count {
return true
}
}
}
return false
}
/**
Get the public key from a certificate data
:param: data is the certificate to pull the public key from
:returns: a public key
*/
func extractPublicKey(data: NSData) -> SecKeyRef? {
var publicKey: NSData?
let possibleCert = SecCertificateCreateWithData(nil,data)
if let cert = possibleCert {
return extractPublicKeyFromCert(cert.takeRetainedValue(),policy: SecPolicyCreateBasicX509().takeRetainedValue())
}
return nil
}
/**
Get the public key from a certificate
:param: data is the certificate to pull the public key from
:returns: a public key
*/
func extractPublicKeyFromCert(cert: SecCertificate, policy: SecPolicy) -> SecKeyRef? {
var possibleTrust: Unmanaged<SecTrust>?
SecTrustCreateWithCertificates(cert,policy, &possibleTrust)
if let trust = possibleTrust {
let t = trust.takeRetainedValue()
var result: SecTrustResultType = 0
SecTrustEvaluate(t,&result)
return SecTrustCopyPublicKey(t).takeRetainedValue()
}
return nil
}
/**
Get the certificate chain for the trust
:param: trust is the trust to lookup the certificate chain for
:returns: the certificate chain for the trust
*/
func certificateChainForTrust(trust: SecTrustRef) -> Array<NSData> {
var collect = Array<NSData>()
for var i = 0; i < SecTrustGetCertificateCount(trust); i++ {
let cert = SecTrustGetCertificateAtIndex(trust,i)
collect.append(SecCertificateCopyData(cert.takeRetainedValue()).takeRetainedValue())
}
return collect
}
/**
Get the public key chain for the trust
:param: trust is the trust to lookup the certificate chain and extract the public keys
:returns: the public keys from the certifcate chain for the trust
*/
func publicKeyChainForTrust(trust: SecTrustRef) -> Array<SecKeyRef> {
var collect = Array<SecKeyRef>()
let policy = SecPolicyCreateBasicX509().takeRetainedValue()
for var i = 0; i < SecTrustGetCertificateCount(trust); i++ {
let cert = SecTrustGetCertificateAtIndex(trust,i)
if let key = extractPublicKeyFromCert(cert.takeRetainedValue(), policy: policy) {
collect.append(key)
}
}
return collect
}
}
+2 -2
View File
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>3.0.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
+177
View File
@@ -0,0 +1,177 @@
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// Compression.swift
//
// Created by Joseph Ross on 7/16/14.
// Copyright © 2017 Joseph Ross.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
//////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// Compression implementation is implemented in conformance with RFC 7692 Compression Extensions
// for WebSocket: https://tools.ietf.org/html/rfc7692
//
//////////////////////////////////////////////////////////////////////////////////////////////////
import Foundation
import zlib
class Decompressor {
private var strm = z_stream()
private var buffer = [UInt8](repeating: 0, count: 0x2000)
private var inflateInitialized = false
private let windowBits:Int
init?(windowBits:Int) {
self.windowBits = windowBits
guard initInflate() else { return nil }
}
private func initInflate() -> Bool {
if Z_OK == inflateInit2_(&strm, -CInt(windowBits),
ZLIB_VERSION, CInt(MemoryLayout<z_stream>.size))
{
inflateInitialized = true
return true
}
return false
}
func reset() throws {
teardownInflate()
guard initInflate() else { throw WSError(type: .compressionError, message: "Error for decompressor on reset", code: 0) }
}
func decompress(_ data: Data, finish: Bool) throws -> Data {
return try data.withUnsafeBytes { (bytes:UnsafePointer<UInt8>) -> Data in
return try decompress(bytes: bytes, count: data.count, finish: finish)
}
}
func decompress(bytes: UnsafePointer<UInt8>, count: Int, finish: Bool) throws -> Data {
var decompressed = Data()
try decompress(bytes: bytes, count: count, out: &decompressed)
if finish {
let tail:[UInt8] = [0x00, 0x00, 0xFF, 0xFF]
try decompress(bytes: tail, count: tail.count, out: &decompressed)
}
return decompressed
}
private func decompress(bytes: UnsafePointer<UInt8>, count: Int, out:inout Data) throws {
var res:CInt = 0
strm.next_in = UnsafeMutablePointer<UInt8>(mutating: bytes)
strm.avail_in = CUnsignedInt(count)
repeat {
strm.next_out = UnsafeMutablePointer<UInt8>(&buffer)
strm.avail_out = CUnsignedInt(buffer.count)
res = inflate(&strm, 0)
let byteCount = buffer.count - Int(strm.avail_out)
out.append(buffer, count: byteCount)
} while res == Z_OK && strm.avail_out == 0
guard (res == Z_OK && strm.avail_out > 0)
|| (res == Z_BUF_ERROR && Int(strm.avail_out) == buffer.count)
else {
throw WSError(type: .compressionError, message: "Error on decompressing", code: 0)
}
}
private func teardownInflate() {
if inflateInitialized, Z_OK == inflateEnd(&strm) {
inflateInitialized = false
}
}
deinit {
teardownInflate()
}
}
class Compressor {
private var strm = z_stream()
private var buffer = [UInt8](repeating: 0, count: 0x2000)
private var deflateInitialized = false
private let windowBits:Int
init?(windowBits: Int) {
self.windowBits = windowBits
guard initDeflate() else { return nil }
}
private func initDeflate() -> Bool {
if Z_OK == deflateInit2_(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
-CInt(windowBits), 8, Z_DEFAULT_STRATEGY,
ZLIB_VERSION, CInt(MemoryLayout<z_stream>.size))
{
deflateInitialized = true
return true
}
return false
}
func reset() throws {
teardownDeflate()
guard initDeflate() else { throw WSError(type: .compressionError, message: "Error for compressor on reset", code: 0) }
}
func compress(_ data: Data) throws -> Data {
var compressed = Data()
var res:CInt = 0
data.withUnsafeBytes { (ptr:UnsafePointer<UInt8>) -> Void in
strm.next_in = UnsafeMutablePointer<UInt8>(mutating: ptr)
strm.avail_in = CUnsignedInt(data.count)
repeat {
strm.next_out = UnsafeMutablePointer<UInt8>(&buffer)
strm.avail_out = CUnsignedInt(buffer.count)
res = deflate(&strm, Z_SYNC_FLUSH)
let byteCount = buffer.count - Int(strm.avail_out)
compressed.append(buffer, count: byteCount)
}
while res == Z_OK && strm.avail_out == 0
}
guard res == Z_OK && strm.avail_out > 0
|| (res == Z_BUF_ERROR && Int(strm.avail_out) == buffer.count)
else {
throw WSError(type: .compressionError, message: "Error on compressing", code: 0)
}
compressed.removeLast(4)
return compressed
}
private func teardownDeflate() {
if deflateInitialized, Z_OK == deflateEnd(&strm) {
deflateInitialized = false
}
}
deinit {
teardownDeflate()
}
}
+165
View File
@@ -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)
}
}
}
+141
View File
@@ -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
}
}
}
+373
View File
@@ -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
+538
View File
@@ -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()
}
}
+667
View File
@@ -0,0 +1,667 @@
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// Websocket.swift
//
// Created by Dalton Cherry on 7/16/14.
// 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
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 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 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
}
//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(forceTimeout: TimeInterval?, closeCode: UInt16)
func write(string: String, completion: (() -> ())?)
func write(data: Data, completion: (() -> ())?)
func write(ping: Data, completion: (() -> ())?)
func write(pong: Data, completion: (() -> ())?)
}
//implements some of the base behaviors
extension WebSocketClient {
public func write(string: String) {
write(string: string, completion: nil)
}
public func write(data: Data) {
write(data: data, completion: nil)
}
public func write(ping: Data) {
write(ping: ping, completion: nil)
}
public func write(pong: Data) {
write(pong: pong, completion: nil)
}
public func disconnect() {
disconnect(forceTimeout: nil, closeCode: CloseCode.normal.rawValue)
}
}
public protocol WSStreamDelegate: class {
func streamIsWaitingForConnectivity()
func streamBetterPathUpdate(isBetter: Bool)
func streamPathViabilityUpdate(isViable: Bool)
func newBytesInStream()
func streamDidError(error: Error?)
}
/// 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
}
//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
// 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 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.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
}
/**
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
}
}
/**
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)
}
/// 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)
}
/// 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()
}
/// MARK: - WSStreamDelegate
public func streamIsWaitingForConnectivity() {
callbackQueue.async { [weak self] in
guard let s = self else { return }
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
+7 -5
View File
@@ -1,14 +1,16 @@
Pod::Spec.new do |s|
s.name = "Starscream"
s.version = "0.9.4"
s.summary = "A conforming WebSocket RFC 6455 client library in Swift for iOS and OSX."
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 = '8.0'
s.osx.deployment_target = '10.9'
s.source_files = '*.swift'
s.requires_arc = 'true'
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 = '4.2'
end
+277 -381
View File
@@ -7,67 +7,53 @@
objects = {
/* Begin PBXBuildFile section */
5C06AE8F1B08050D00D41060 /* Security.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C06AE8E1B08050D00D41060 /* Security.swift */; };
5C06AE901B08050D00D41060 /* Security.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C06AE8E1B08050D00D41060 /* Security.swift */; };
6B3E7A0319D48C2F006071F7 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
6B3E7A0519D48C41006071F7 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0419D48C41006071F7 /* WebSocket.swift */; };
6B3E7A0719D48C5F006071F7 /* Starscream.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3E7A0619D48C5F006071F7 /* Starscream.h */; settings = {ATTRIBUTES = (Public, ); }; };
D9C3E36A19E48FF1009FC285 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9C3E35F19E48FF1009FC285 /* Starscream.framework */; };
D9C3E37819E4903F009FC285 /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */; };
D9C3E37919E49051009FC285 /* Starscream.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3E7A0619D48C5F006071F7 /* Starscream.h */; settings = {ATTRIBUTES = (Public, ); }; };
D9C3E37A19E49058009FC285 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3E7A0419D48C41006071F7 /* WebSocket.swift */; };
335FA1F91F5DF71D00F6D2EC /* CompressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D88EAF831ED4E7D8004FE2C3 /* CompressionTests.swift */; };
335FA1FA1F5DF71D00F6D2EC /* StarscreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */; };
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, ); }; };
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 */
D9C3E36B19E48FF1009FC285 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6B3E79DD19D48B7F006071F7 /* Project object */;
proxyType = 1;
remoteGlobalIDString = D9C3E35E19E48FF1009FC285;
remoteInfo = StarscreamOSX;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
5C06AE8E1B08050D00D41060 /* Security.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Security.swift; sourceTree = SOURCE_ROOT; };
6B3E79E619D48B7F006071F7 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6B3E79EA19D48B7F006071F7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
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; };
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>"; };
6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StarscreamTests.swift; sourceTree = "<group>"; };
6B3E7A0419D48C41006071F7 /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = SOURCE_ROOT; };
6B3E7A0619D48C5F006071F7 /* Starscream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Starscream.h; sourceTree = SOURCE_ROOT; };
D9C3E35F19E48FF1009FC285 /* Starscream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Starscream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarscreamOSXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StarscreamTests.swift; path = StarscreamTests/StarscreamTests.swift; sourceTree = "<group>"; };
BBB5ABE1215E2217005B48B6 /* Compression.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Compression.swift; path = Starscream/Compression.swift; sourceTree = "<group>"; };
BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLClientCertificate.swift; path = Starscream/SSLClientCertificate.swift; sourceTree = "<group>"; };
BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLSecurity.swift; path = Starscream/SSLSecurity.swift; sourceTree = "<group>"; };
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>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
6B3E79E219D48B7F006071F7 /* Frameworks */ = {
335FA1FB1F5DF71D00F6D2EC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
335FA1FC1F5DF71D00F6D2EC /* libz.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
6B3E79EE19D48B7F006071F7 /* Frameworks */ = {
33CCF0891F5DDC030099B092 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E35B19E48FF1009FC285 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E36619E48FF1009FC285 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D9C3E36A19E48FF1009FC285 /* Starscream.framework in Frameworks */,
33CCF08A1F5DDC030099B092 /* libz.tbd in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -77,38 +63,43 @@
6B3E79DC19D48B7F006071F7 = {
isa = PBXGroup;
children = (
6B3E79E819D48B7F006071F7 /* Starscream */,
63895636219AD95900C3C085 /* TestConnection.playground */,
6B3E79E819D48B7F006071F7 /* Sources */,
6B3E79FF19D48C2F006071F7 /* Tests */,
6B3E79E719D48B7F006071F7 /* Products */,
D88EAF801ED4DFD3004FE2C3 /* Frameworks */,
);
sourceTree = "<group>";
};
6B3E79E719D48B7F006071F7 /* Products */ = {
isa = PBXGroup;
children = (
6B3E79E619D48B7F006071F7 /* Starscream.framework */,
6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */,
D9C3E35F19E48FF1009FC285 /* Starscream.framework */,
D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */,
33CCF0921F5DDC030099B092 /* Starscream.framework */,
335FA2021F5DF71D00F6D2EC /* Starscream Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
6B3E79E819D48B7F006071F7 /* Starscream */ = {
6B3E79E819D48B7F006071F7 /* Sources */ = {
isa = PBXGroup;
children = (
6B3E7A0419D48C41006071F7 /* WebSocket.swift */,
5C06AE8E1B08050D00D41060 /* Security.swift */,
6B3E7A0619D48C5F006071F7 /* Starscream.h */,
633624AD219AD2F80053CB46 /* FoundationStream.swift */,
633624AC219AD2F80053CB46 /* NetworkStream.swift */,
633624AE219AD2F80053CB46 /* WSMessage.swift */,
BBB5ABE1215E2217005B48B6 /* Compression.swift */,
BBB5ABE2215E2217005B48B6 /* SSLClientCertificate.swift */,
BBB5ABE3215E2217005B48B6 /* SSLSecurity.swift */,
BBB5ABE4215E2217005B48B6 /* WebSocket.swift */,
5C1360001C473BEF00AA3A01 /* Starscream.h */,
6B3E79E919D48B7F006071F7 /* Supporting Files */,
);
path = Starscream;
path = Sources;
sourceTree = "<group>";
};
6B3E79E919D48B7F006071F7 /* Supporting Files */ = {
isa = PBXGroup;
children = (
6B3E79EA19D48B7F006071F7 /* Info.plist */,
5C13600C1C473BFE00AA3A01 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -117,41 +108,59 @@
isa = PBXGroup;
children = (
6B3E7A0019D48C2F006071F7 /* Info.plist */,
6B3E7A0119D48C2F006071F7 /* StarscreamTests.swift */,
742419BB1DC6BDBA003ACE43 /* StarscreamTests.swift */,
D88EAF831ED4E7D8004FE2C3 /* CompressionTests.swift */,
);
path = Tests;
sourceTree = "<group>";
};
D88EAF801ED4DFD3004FE2C3 /* Frameworks */ = {
isa = PBXGroup;
children = (
D88EAF811ED4DFD3004FE2C3 /* libz.tbd */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
6B3E79E319D48B7F006071F7 /* Headers */ = {
33CCF08B1F5DDC030099B092 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
6B3E7A0719D48C5F006071F7 /* Starscream.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E35C19E48FF1009FC285 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
D9C3E37919E49051009FC285 /* Starscream.h in Headers */,
33CCF08C1F5DDC030099B092 /* Starscream.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
6B3E79E519D48B7F006071F7 /* Starscream */ = {
335FA1F41F5DF71D00F6D2EC /* Starscream Tests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 6B3E79F919D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream" */;
buildConfigurationList = 335FA1FF1F5DF71D00F6D2EC /* Build configuration list for PBXNativeTarget "Starscream Tests" */;
buildPhases = (
6B3E79E119D48B7F006071F7 /* Sources */,
6B3E79E219D48B7F006071F7 /* Frameworks */,
6B3E79E319D48B7F006071F7 /* Headers */,
6B3E79E419D48B7F006071F7 /* Resources */,
335FA1F51F5DF71D00F6D2EC /* Sources */,
335FA1FB1F5DF71D00F6D2EC /* Frameworks */,
335FA1FE1F5DF71D00F6D2EC /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "Starscream Tests";
productName = StarscreamTests;
productReference = 335FA2021F5DF71D00F6D2EC /* Starscream Tests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
33CCF0841F5DDC030099B092 /* Starscream */ = {
isa = PBXNativeTarget;
buildConfigurationList = 33CCF08F1F5DDC030099B092 /* Build configuration list for PBXNativeTarget "Starscream" */;
buildPhases = (
33CCF0851F5DDC030099B092 /* Sources */,
33CCF0891F5DDC030099B092 /* Frameworks */,
33CCF08B1F5DDC030099B092 /* Headers */,
33CCF08E1F5DDC030099B092 /* Resources */,
);
buildRules = (
);
@@ -159,82 +168,26 @@
);
name = Starscream;
productName = Starscream;
productReference = 6B3E79E619D48B7F006071F7 /* Starscream.framework */;
productReference = 33CCF0921F5DDC030099B092 /* Starscream.framework */;
productType = "com.apple.product-type.framework";
};
6B3E79F019D48B7F006071F7 /* StarscreamTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 6B3E79FC19D48B7F006071F7 /* Build configuration list for PBXNativeTarget "StarscreamTests" */;
buildPhases = (
6B3E79ED19D48B7F006071F7 /* Sources */,
6B3E79EE19D48B7F006071F7 /* Frameworks */,
6B3E79EF19D48B7F006071F7 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = StarscreamTests;
productName = StarscreamTests;
productReference = 6B3E79F119D48B7F006071F7 /* StarscreamTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
D9C3E35E19E48FF1009FC285 /* StarscreamOSX */ = {
isa = PBXNativeTarget;
buildConfigurationList = D9C3E37619E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSX" */;
buildPhases = (
D9C3E35A19E48FF1009FC285 /* Sources */,
D9C3E35B19E48FF1009FC285 /* Frameworks */,
D9C3E35C19E48FF1009FC285 /* Headers */,
D9C3E35D19E48FF1009FC285 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = StarscreamOSX;
productName = StarscreamOSX;
productReference = D9C3E35F19E48FF1009FC285 /* Starscream.framework */;
productType = "com.apple.product-type.framework";
};
D9C3E36819E48FF1009FC285 /* StarscreamOSXTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = D9C3E37719E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSXTests" */;
buildPhases = (
D9C3E36519E48FF1009FC285 /* Sources */,
D9C3E36619E48FF1009FC285 /* Frameworks */,
D9C3E36719E48FF1009FC285 /* Resources */,
);
buildRules = (
);
dependencies = (
D9C3E36C19E48FF1009FC285 /* PBXTargetDependency */,
);
name = StarscreamOSXTests;
productName = StarscreamOSXTests;
productReference = D9C3E36919E48FF1009FC285 /* StarscreamOSXTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
6B3E79DD19D48B7F006071F7 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0600;
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = Vluxe;
TargetAttributes = {
6B3E79E519D48B7F006071F7 = {
CreatedOnToolsVersion = 6.0.1;
335FA1F41F5DF71D00F6D2EC = {
LastSwiftMigration = 0900;
};
6B3E79F019D48B7F006071F7 = {
CreatedOnToolsVersion = 6.0.1;
};
D9C3E35E19E48FF1009FC285 = {
CreatedOnToolsVersion = 6.1;
};
D9C3E36819E48FF1009FC285 = {
CreatedOnToolsVersion = 6.1;
33CCF0841F5DDC030099B092 = {
LastSwiftMigration = 0940;
ProvisioningStyle = Manual;
};
};
};
@@ -250,37 +203,21 @@
projectDirPath = "";
projectRoot = "";
targets = (
6B3E79E519D48B7F006071F7 /* Starscream */,
6B3E79F019D48B7F006071F7 /* StarscreamTests */,
D9C3E35E19E48FF1009FC285 /* StarscreamOSX */,
D9C3E36819E48FF1009FC285 /* StarscreamOSXTests */,
33CCF0841F5DDC030099B092 /* Starscream */,
335FA1F41F5DF71D00F6D2EC /* Starscream Tests */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
6B3E79E419D48B7F006071F7 /* Resources */ = {
335FA1FE1F5DF71D00F6D2EC /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
6B3E79EF19D48B7F006071F7 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E35D19E48FF1009FC285 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E36719E48FF1009FC285 /* Resources */ = {
33CCF08E1F5DDC030099B092 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -290,74 +227,188 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
6B3E79E119D48B7F006071F7 /* Sources */ = {
335FA1F51F5DF71D00F6D2EC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6B3E7A0519D48C41006071F7 /* WebSocket.swift in Sources */,
5C06AE8F1B08050D00D41060 /* Security.swift in Sources */,
335FA1F91F5DF71D00F6D2EC /* CompressionTests.swift in Sources */,
335FA1FA1F5DF71D00F6D2EC /* StarscreamTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
6B3E79ED19D48B7F006071F7 /* Sources */ = {
33CCF0851F5DDC030099B092 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6B3E7A0319D48C2F006071F7 /* StarscreamTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E35A19E48FF1009FC285 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D9C3E37A19E49058009FC285 /* WebSocket.swift in Sources */,
5C06AE901B08050D00D41060 /* Security.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D9C3E36519E48FF1009FC285 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D9C3E37819E4903F009FC285 /* StarscreamTests.swift in Sources */,
BBB5ABE5215E2217005B48B6 /* Compression.swift in Sources */,
BBB5ABE8215E2217005B48B6 /* WebSocket.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 */
D9C3E36C19E48FF1009FC285 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D9C3E35E19E48FF1009FC285 /* StarscreamOSX */;
targetProxy = D9C3E36B19E48FF1009FC285 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
335FA2001F5DF71D00F6D2EC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = 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";
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
335FA2011F5DF71D00F6D2EC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
CLANG_ENABLE_MODULES = 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";
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = "";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator macosx";
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
};
name = Release;
};
33CCF0901F5DDC030099B092 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BITCODE_GENERATION_MODE = marker;
CLANG_ENABLE_MODULES = 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";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
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;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
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;
};
33CCF0911F5DDC030099B092 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BITCODE_GENERATION_MODE = bitcode;
CLANG_ENABLE_MODULES = 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";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
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;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
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;
};
6B3E79F719D48B7F006071F7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
APPLICATION_EXTENSION_API_ONLY = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@@ -373,9 +424,12 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SDKROOT = "";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchsimulator watchos";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4";
VALID_ARCHS = "x86_64 i386";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@@ -385,17 +439,26 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
APPLICATION_EXTENSION_API_ONLY = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -404,6 +467,7 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -412,170 +476,38 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
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 = "";
};
name = Release;
};
6B3E79FA19D48B7F006071F7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
6B3E79FB19D48B7F006071F7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SKIP_INSTALL = YES;
};
name = Release;
};
6B3E79FD19D48B7F006071F7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
6B3E79FE19D48B7F006071F7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
D9C3E37219E48FF1009FC285 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = Starscream;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Debug;
};
D9C3E37319E48FF1009FC285 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = Starscream;
SDKROOT = macosx;
SKIP_INSTALL = YES;
};
name = Release;
};
D9C3E37419E48FF1009FC285 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Debug;
};
D9C3E37519E48FF1009FC285 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
335FA1FF1F5DF71D00F6D2EC /* Build configuration list for PBXNativeTarget "Starscream Tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
335FA2001F5DF71D00F6D2EC /* Debug */,
335FA2011F5DF71D00F6D2EC /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
33CCF08F1F5DDC030099B092 /* Build configuration list for PBXNativeTarget "Starscream" */ = {
isa = XCConfigurationList;
buildConfigurations = (
33CCF0901F5DDC030099B092 /* Debug */,
33CCF0911F5DDC030099B092 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6B3E79E019D48B7F006071F7 /* Build configuration list for PBXProject "Starscream" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -585,42 +517,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6B3E79F919D48B7F006071F7 /* Build configuration list for PBXNativeTarget "Starscream" */ = {
isa = XCConfigurationList;
buildConfigurations = (
6B3E79FA19D48B7F006071F7 /* Debug */,
6B3E79FB19D48B7F006071F7 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
6B3E79FC19D48B7F006071F7 /* Build configuration list for PBXNativeTarget "StarscreamTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
6B3E79FD19D48B7F006071F7 /* Debug */,
6B3E79FE19D48B7F006071F7 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D9C3E37619E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D9C3E37219E48FF1009FC285 /* Debug */,
D9C3E37319E48FF1009FC285 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D9C3E37719E48FF1009FC285 /* Build configuration list for PBXNativeTarget "StarscreamOSXTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D9C3E37419E48FF1009FC285 /* Debug */,
D9C3E37519E48FF1009FC285 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 6B3E79DD19D48B7F006071F7 /* Project object */;
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
LastUpgradeVersion = "0900"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
BlueprintIdentifier = "33CCF0841F5DDC030099B092"
BuildableName = "Starscream.framework"
BlueprintName = "Starscream"
ReferencedContainer = "container:Starscream.xcodeproj">
@@ -23,26 +23,55 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "335FA1F41F5DF71D00F6D2EC"
BuildableName = "Starscream Tests.xctest"
BlueprintName = "Starscream Tests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
<LocationScenarioReference
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
referenceType = "1">
</LocationScenarioReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "33CCF0841F5DDC030099B092"
BuildableName = "Starscream.framework"
BlueprintName = "Starscream"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
BlueprintIdentifier = "33CCF0841F5DDC030099B092"
BuildableName = "Starscream.framework"
BlueprintName = "Starscream"
ReferencedContainer = "container:Starscream.xcodeproj">
@@ -52,15 +81,15 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79E519D48B7F006071F7"
BlueprintIdentifier = "33CCF0841F5DDC030099B092"
BuildableName = "Starscream.framework"
BlueprintName = "Starscream"
ReferencedContainer = "container:Starscream.xcodeproj">
@@ -1,110 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
BuildableName = "Starscream.framework"
BlueprintName = "StarscreamOSX"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9C3E36819E48FF1009FC285"
BuildableName = "StarscreamOSXTests.xctest"
BlueprintName = "StarscreamOSXTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9C3E36819E48FF1009FC285"
BuildableName = "StarscreamOSXTests.xctest"
BlueprintName = "StarscreamOSXTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
BuildableName = "Starscream.framework"
BlueprintName = "StarscreamOSX"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
BuildableName = "Starscream.framework"
BlueprintName = "StarscreamOSX"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D9C3E35E19E48FF1009FC285"
BuildableName = "Starscream.framework"
BlueprintName = "StarscreamOSX"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
BuildableName = "StarscreamTests.xctest"
BlueprintName = "StarscreamTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
BuildableName = "StarscreamTests.xctest"
BlueprintName = "StarscreamTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
BuildableName = "StarscreamTests.xctest"
BlueprintName = "StarscreamTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
BuildableName = "StarscreamTests.xctest"
BlueprintName = "StarscreamTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6B3E79F019D48B7F006071F7"
BuildableName = "StarscreamTests.xctest"
BlueprintName = "StarscreamTests"
ReferencedContainer = "container:Starscream.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
+22
View File
@@ -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>
+67
View File
@@ -0,0 +1,67 @@
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// CompressionTests.swift
//
// Created by Joseph Ross on 7/16/14.
// Copyright © 2017 Joseph Ross.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
//////////////////////////////////////////////////////////////////////////////////////////////////
import XCTest
@testable import Starscream
class CompressionTests: XCTestCase {
override func setUp() {
super.setUp()
// Put setup code here. This method is called before the invocation of each test method in the class.
}
override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
super.tearDown()
}
func testBasic() {
let compressor = Compressor(windowBits: 15)!
let decompressor = Decompressor(windowBits: 15)!
let rawData = "Hello, World! Hello, World! Hello, World! Hello, World! Hello, World!".data(using: .utf8)!
let compressed = try! compressor.compress(rawData)
let uncompressed = try! decompressor.decompress(compressed, finish: true)
XCTAssert(rawData == uncompressed)
}
func testHugeData() {
let compressor = Compressor(windowBits: 15)!
let decompressor = Decompressor(windowBits: 15)!
// 2 Gigs!
// var rawData = Data(repeating: 0, count: 0x80000000)
var rawData = Data(repeating: 0, count: 0x80000)
let rawDataLen = rawData.count
rawData.withUnsafeMutableBytes { (ptr: UnsafeMutablePointer<UInt8>) -> Void in
arc4random_buf(ptr, rawDataLen)
}
let compressed = try! compressor.compress(rawData)
let uncompressed = try! decompressor.decompress(compressed, finish: true)
XCTAssert(rawData == uncompressed)
}
}
+55
View File
@@ -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 -1
View File
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -0,0 +1,69 @@
//
// StarscreamTests.swift
// StarscreamTests
//
// Created by Austin Cherry on 9/25/14.
// Copyright (c) 2014 Vluxe. All rights reserved.
//
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() {
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() {
// Put the code you want to measure the time of here.
}
}
}
+51
View File
@@ -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)
}
}
-722
View File
@@ -1,722 +0,0 @@
//////////////////////////////////////////////////////////////////////////////////////////////////
//
// Websocket.swift
//
// Created by Dalton Cherry on 7/16/14.
//
//////////////////////////////////////////////////////////////////////////////////////////////////
import Foundation
import CoreFoundation
public protocol WebSocketDelegate: class {
func websocketDidConnect(socket: WebSocket)
func websocketDidDisconnect(socket: WebSocket, error: NSError?)
func websocketDidReceiveMessage(socket: WebSocket, text: String)
func websocketDidReceiveData(socket: WebSocket, data: NSData)
}
public protocol WebSocketPongDelegate: class {
func websocketDidReceivePong(socket: WebSocket)
}
public class WebSocket : NSObject, NSStreamDelegate {
enum OpCode : UInt8 {
case ContinueFrame = 0x0
case TextFrame = 0x1
case BinaryFrame = 0x2
//3-7 are reserved.
case ConnectionClose = 0x8
case Ping = 0x9
case Pong = 0xA
//B-F reserved.
}
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
}
enum InternalErrorCode : UInt16 {
// 0-999 WebSocket status codes not used
case OutputStreamWriteError = 1
}
//Where the callback is executed. It defaults to the main UI thread queue.
public var queue = dispatch_get_main_queue()
var optionalProtocols : Array<String>?
//Constant Values.
let headerWSUpgradeName = "Upgrade"
let headerWSUpgradeValue = "websocket"
let headerWSHostName = "Host"
let headerWSConnectionName = "Connection"
let headerWSConnectionValue = "Upgrade"
let headerWSProtocolName = "Sec-WebSocket-Protocol"
let headerWSVersionName = "Sec-WebSocket-Version"
let headerWSVersionValue = "13"
let headerWSKeyName = "Sec-WebSocket-Key"
let headerOriginName = "Origin"
let headerWSAcceptName = "Sec-WebSocket-Accept"
let BUFFER_MAX = 2048
let FinMask: UInt8 = 0x80
let OpCodeMask: UInt8 = 0x0F
let RSVMask: UInt8 = 0x70
let MaskMask: UInt8 = 0x80
let PayloadLenMask: UInt8 = 0x7F
let MaxFrameSize: Int = 32
class WSResponse {
var isFin = false
var code: OpCode = .ContinueFrame
var bytesLeft = 0
var frameCount = 0
var buffer: NSMutableData?
}
public weak var delegate: WebSocketDelegate?
public weak var pongDelegate: WebSocketPongDelegate?
private var url: NSURL
private var inputStream: NSInputStream?
private var outputStream: NSOutputStream?
private var isRunLoop = false
private var connected = false
private var isCreated = false
private var writeQueue: NSOperationQueue?
private var readStack = Array<WSResponse>()
private var inputQueue = Array<NSData>()
private var fragBuffer: NSData?
public var headers = Dictionary<String,String>()
public var voipEnabled = false
public var selfSignedSSL = false
public var security: Security?
private var certValidated = false
private var connectedBlock: ((Void) -> Void)? = nil
private var disconnectedBlock: ((NSError?) -> Void)? = nil
private var receivedTextBlock: ((String) -> Void)? = nil
private var receivedDataBlock: ((NSData) -> Void)? = nil
public var isConnected :Bool {
return connected
}
//init the websocket with a url
public init(url: NSURL) {
self.url = url
}
//used for setting protocols.
public convenience init(url: NSURL, protocols: Array<String>) {
self.init(url: url)
optionalProtocols = protocols
}
//closure based instead of the delegate
public convenience init(url: NSURL, protocols: Array<String>, connect:((Void) -> Void), disconnect:((NSError?) -> Void), text:((String) -> Void), data:(NSData) -> Void) {
self.init(url: url, protocols: protocols)
connectedBlock = connect
disconnectedBlock = disconnect
receivedTextBlock = text
receivedDataBlock = data
}
//same as above, just shorter
public convenience init(url: NSURL, connect:((Void) -> Void), disconnect:((NSError?) -> Void), text:((String) -> Void)) {
self.init(url: url)
connectedBlock = connect
disconnectedBlock = disconnect
receivedTextBlock = text
}
//same as above, just shorter
public convenience init(url: NSURL, connect:((Void) -> Void), disconnect:((NSError?) -> Void), data:((NSData) -> Void)) {
self.init(url: url)
connectedBlock = connect
disconnectedBlock = disconnect
receivedDataBlock = data
}
///Connect to the websocket server on a background thread
public func connect() {
if isCreated {
return
}
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), {
self.isCreated = true
self.createHTTPRequest()
self.isCreated = false
})
}
///disconnect from the websocket server
public func disconnect() {
writeError(CloseCode.Normal.rawValue)
}
///write a string to the websocket. This sends it as a text frame.
public func writeString(str: String) {
dequeueWrite(str.dataUsingEncoding(NSUTF8StringEncoding)!, code: .TextFrame)
}
///write binary data to the websocket. This sends it as a binary frame.
public func writeData(data: NSData) {
dequeueWrite(data, code: .BinaryFrame)
}
//write a ping to the websocket. This sends it as a control frame.
//yodel a sound to the planet. This sends it as an astroid. http://youtu.be/Eu5ZJELRiJ8?t=42s
public func writePing(data: NSData) {
dequeueWrite(data, code: .Ping)
}
//private methods below!
//private method that starts the connection
private func createHTTPRequest() {
let str: NSString = url.absoluteString!
let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET",
url, kCFHTTPVersion1_1)
var port = url.port
if port == nil {
if url.scheme == "wss" || url.scheme == "https" {
port = 443
} else {
port = 80
}
}
self.addHeader(urlRequest, key: headerWSUpgradeName, val: headerWSUpgradeValue)
self.addHeader(urlRequest, key: headerWSConnectionName, val: headerWSConnectionValue)
if let protocols = optionalProtocols {
self.addHeader(urlRequest, key: headerWSProtocolName, val: ",".join(protocols))
}
self.addHeader(urlRequest, key: headerWSVersionName, val: headerWSVersionValue)
self.addHeader(urlRequest, key: headerWSKeyName, val: self.generateWebSocketKey())
self.addHeader(urlRequest, key: headerOriginName, val: url.absoluteString!)
self.addHeader(urlRequest, key: headerWSHostName, val: "\(url.host!):\(port!)")
for (key,value) in headers {
self.addHeader(urlRequest, key: key, val: value)
}
let serializedRequest: NSData = CFHTTPMessageCopySerializedMessage(urlRequest.takeUnretainedValue()).takeUnretainedValue()
self.initStreamsWithData(serializedRequest, Int(port!))
}
//Add a header to the CFHTTPMessage by using the NSString bridges to CFString
private func addHeader(urlRequest: Unmanaged<CFHTTPMessage>,key: String, val: String) {
let nsKey: NSString = key
let nsVal: NSString = val
CFHTTPMessageSetHeaderFieldValue(urlRequest.takeUnretainedValue(),
nsKey,
nsVal)
}
//generate a websocket key as needed in rfc
private func generateWebSocketKey() -> String {
var key = ""
let seed = 16
for (var i = 0; i < seed; i++) {
let uni = UnicodeScalar(UInt32(97 + arc4random_uniform(25)))
key += "\(Character(uni))"
}
var data = key.dataUsingEncoding(NSUTF8StringEncoding)
var baseKey = data?.base64EncodedStringWithOptions(NSDataBase64EncodingOptions(0))
return baseKey!
}
//Start the stream connection and write the data to the output stream
private func initStreamsWithData(data: NSData, _ port: Int) {
//higher level API we will cut over to at some point
//NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream)
var readStream: Unmanaged<CFReadStream>?
var writeStream: Unmanaged<CFWriteStream>?
let h: NSString = url.host!
CFStreamCreatePairWithSocketToHost(nil, h, UInt32(port), &readStream, &writeStream)
inputStream = readStream!.takeUnretainedValue()
outputStream = writeStream!.takeUnretainedValue()
inputStream!.delegate = self
outputStream!.delegate = self
if url.scheme == "wss" || url.scheme == "https" {
inputStream!.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
outputStream!.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
} else {
certValidated = true //not a https session, so no need to check SSL pinning
}
if self.voipEnabled {
inputStream!.setProperty(NSStreamNetworkServiceTypeVoIP, forKey: NSStreamNetworkServiceType)
outputStream!.setProperty(NSStreamNetworkServiceTypeVoIP, forKey: NSStreamNetworkServiceType)
}
if self.selfSignedSSL {
let settings: Dictionary<NSObject, NSObject> = [kCFStreamSSLValidatesCertificateChain: NSNumber(bool:false), kCFStreamSSLPeerName: kCFNull]
inputStream!.setProperty(settings, forKey: kCFStreamPropertySSLSettings as! String)
outputStream!.setProperty(settings, forKey: kCFStreamPropertySSLSettings as! String)
}
isRunLoop = true
inputStream!.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
outputStream!.scheduleInRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
inputStream!.open()
outputStream!.open()
let bytes = UnsafePointer<UInt8>(data.bytes)
outputStream!.write(bytes, maxLength: data.length)
while(isRunLoop) {
NSRunLoop.currentRunLoop().runMode(NSDefaultRunLoopMode, beforeDate: NSDate.distantFuture() as! NSDate)
}
}
//delegate for the stream methods. Processes incoming bytes
public func stream(aStream: NSStream, handleEvent eventCode: NSStreamEvent) {
if let sec = security where !certValidated && (eventCode == .HasBytesAvailable || eventCode == .HasSpaceAvailable) {
var possibleTrust: AnyObject? = aStream.propertyForKey(kCFStreamPropertySSLPeerTrust as! String)
if let trust: AnyObject = possibleTrust {
var domain: AnyObject? = aStream.propertyForKey(kCFStreamSSLPeerName as! String)
if sec.isValid(trust as! SecTrustRef, domain: domain as! String?) {
certValidated = true
} else {
let error = self.errorWithDetail("Invalid SSL certificate", code: 1)
doDisconnect(error)
disconnectStream(error)
return
}
}
}
if eventCode == .HasBytesAvailable {
if(aStream == inputStream) {
processInputStream()
}
} else if eventCode == .ErrorOccurred {
disconnectStream(aStream.streamError)
} else if eventCode == .EndEncountered {
disconnectStream(nil)
}
}
//disconnect the stream object
private func disconnectStream(error: NSError?) {
if writeQueue != nil {
writeQueue!.waitUntilAllOperationsAreFinished()
}
if let stream = inputStream {
stream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
stream.close()
}
if let stream = outputStream {
stream.removeFromRunLoop(NSRunLoop.currentRunLoop(), forMode: NSDefaultRunLoopMode)
stream.close()
}
outputStream = nil
isRunLoop = false
certValidated = false
self.doDisconnect(error)
connected = false
}
///handles the incoming bytes and sending them to the proper processing method
private func processInputStream() {
let buf = NSMutableData(capacity: BUFFER_MAX)
var buffer = UnsafeMutablePointer<UInt8>(buf!.bytes)
let length = inputStream!.read(buffer, maxLength: BUFFER_MAX)
if length > 0 {
if !connected {
connected = processHTTP(buffer, bufferLen: length)
if !connected {
self.doDisconnect(self.errorWithDetail("Invalid HTTP upgrade", code: 1))
}
} else {
var process = false
if inputQueue.count == 0 {
process = true
}
inputQueue.append(NSData(bytes: buffer, length: length))
if process {
dequeueInput()
}
}
}
}
///dequeue the incoming input so it is processed in order
private func dequeueInput() {
if inputQueue.count > 0 {
let data = inputQueue[0]
var work = data
if (fragBuffer != nil) {
var combine = NSMutableData(data: fragBuffer!)
combine.appendData(data)
work = combine
fragBuffer = nil
}
let buffer = UnsafePointer<UInt8>(work.bytes)
processRawMessage(buffer, bufferLen: work.length)
inputQueue = inputQueue.filter{$0 != data}
dequeueInput()
}
}
///Finds the HTTP Packet in the TCP stream, by looking for the CRLF.
private func processHTTP(buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Bool {
let CRLFBytes = [UInt8(ascii: "\r"), UInt8(ascii: "\n"), UInt8(ascii: "\r"), UInt8(ascii: "\n")]
var k = 0
var totalSize = 0
for var i = 0; i < bufferLen; i++ {
if buffer[i] == CRLFBytes[k] {
k++
if k == 3 {
totalSize = i + 1
break
}
} else {
k = 0
}
}
if totalSize > 0 {
if validateResponse(buffer, bufferLen: totalSize) {
dispatch_async(queue,{
if let connectBlock = self.connectedBlock {
connectBlock()
}
self.delegate?.websocketDidConnect(self)
})
totalSize += 1 //skip the last \n
let restSize = bufferLen - totalSize
if restSize > 0 {
processRawMessage((buffer+totalSize),bufferLen: restSize)
}
return true
}
}
return false
}
///validates the HTTP is a 101 as per the RFC spec
private func validateResponse(buffer: UnsafePointer<UInt8>, bufferLen: Int) -> Bool {
let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, 0).takeRetainedValue()
CFHTTPMessageAppendBytes(response, buffer, bufferLen)
if CFHTTPMessageGetResponseStatusCode(response) != 101 {
return false
}
let cfHeaders = CFHTTPMessageCopyAllHeaderFields(response)
let headers: NSDictionary = cfHeaders.takeRetainedValue()
let acceptKey = headers[headerWSAcceptName] as! NSString
if acceptKey.length > 0 {
return true
}
return false
}
///process the websocket data
private func processRawMessage(buffer: UnsafePointer<UInt8>, bufferLen: Int) {
var response = readStack.last
if response != nil && bufferLen < 2 {
fragBuffer = NSData(bytes: buffer, length: bufferLen)
return
}
if response != nil && response!.bytesLeft > 0 {
let resp = response!
var len = resp.bytesLeft
var extra = bufferLen - resp.bytesLeft
if resp.bytesLeft > bufferLen {
len = bufferLen
extra = 0
}
resp.bytesLeft -= len
resp.buffer?.appendData(NSData(bytes: buffer, length: len))
processResponse(resp)
var offset = bufferLen - extra
if extra > 0 {
processExtra((buffer+offset), bufferLen: extra)
}
return
} else {
let isFin = (FinMask & buffer[0])
let receivedOpcode = (OpCodeMask & buffer[0])
let isMasked = (MaskMask & buffer[1])
let payloadLen = (PayloadLenMask & buffer[1])
var offset = 2
if((isMasked > 0 || (RSVMask & buffer[0]) > 0) && receivedOpcode != OpCode.Pong.rawValue) {
let errCode = CloseCode.ProtocolError.rawValue
let error = self.errorWithDetail("masked and rsv data is not currently supported", code: errCode)
self.doDisconnect(error)
writeError(errCode)
return
}
let isControlFrame = (receivedOpcode == OpCode.ConnectionClose.rawValue || receivedOpcode == OpCode.Ping.rawValue)
if !isControlFrame && (receivedOpcode != OpCode.BinaryFrame.rawValue && receivedOpcode != OpCode.ContinueFrame.rawValue &&
receivedOpcode != OpCode.TextFrame.rawValue && receivedOpcode != OpCode.Pong.rawValue) {
let errCode = CloseCode.ProtocolError.rawValue
let error = self.errorWithDetail("unknown opcode: \(receivedOpcode)", code: errCode)
self.doDisconnect(error)
writeError(errCode)
return
}
if isControlFrame && isFin == 0 {
let errCode = CloseCode.ProtocolError.rawValue
let error = self.errorWithDetail("control frames can't be fragmented", code: errCode)
self.doDisconnect(error)
writeError(errCode)
return
}
if receivedOpcode == OpCode.ConnectionClose.rawValue {
var code = CloseCode.Normal.rawValue
if payloadLen == 1 {
code = CloseCode.ProtocolError.rawValue
} else if payloadLen > 1 {
var codeBuffer = UnsafePointer<UInt16>((buffer+offset))
code = codeBuffer[0].bigEndian
if code < 1000 || (code > 1003 && code < 1007) || (code > 1011 && code < 3000) {
code = CloseCode.ProtocolError.rawValue
}
offset += 2
}
if payloadLen > 2 {
let len = Int(payloadLen-2)
if len > 0 {
let bytes = UnsafePointer<UInt8>((buffer+offset))
var str: NSString? = NSString(data: NSData(bytes: bytes, length: len), encoding: NSUTF8StringEncoding)
if str == nil {
code = CloseCode.ProtocolError.rawValue
}
}
}
let error = self.errorWithDetail("connection closed by server", code: code)
self.doDisconnect(error)
writeError(code)
return
}
if isControlFrame && payloadLen > 125 {
writeError(CloseCode.ProtocolError.rawValue)
return
}
var dataLength = UInt64(payloadLen)
if dataLength == 127 {
let bytes = UnsafePointer<UInt64>((buffer+offset))
dataLength = bytes[0].bigEndian
offset += sizeof(UInt64)
} else if dataLength == 126 {
let bytes = UnsafePointer<UInt16>((buffer+offset))
dataLength = UInt64(bytes[0].bigEndian)
offset += sizeof(UInt16)
}
var len = dataLength
if dataLength > UInt64(bufferLen) {
len = UInt64(bufferLen-offset)
}
var data: NSData!
if len < 0 {
len = 0
data = NSData()
} else {
data = NSData(bytes: UnsafePointer<UInt8>((buffer+offset)), length: Int(len))
}
if receivedOpcode == OpCode.Pong.rawValue {
self.pongDelegate?.websocketDidReceivePong(self)
let step = Int(offset+numericCast(len))
let extra = bufferLen-step
if extra > 0 {
processRawMessage((buffer+step), bufferLen: extra)
}
return
}
var response = readStack.last
if isControlFrame {
response = nil //don't append pings
}
if isFin == 0 && receivedOpcode == OpCode.ContinueFrame.rawValue && response == nil {
let errCode = CloseCode.ProtocolError.rawValue
let error = self.errorWithDetail("continue frame before a binary or text frame", code: errCode)
self.doDisconnect(error)
writeError(errCode)
return
}
var isNew = false
if(response == nil) {
if receivedOpcode == OpCode.ContinueFrame.rawValue {
let errCode = CloseCode.ProtocolError.rawValue
let error = self.errorWithDetail("first frame can't be a continue frame",
code: errCode)
self.doDisconnect(error)
writeError(errCode)
return
}
isNew = true
response = WSResponse()
response!.code = OpCode(rawValue: receivedOpcode)!
response!.bytesLeft = Int(dataLength)
response!.buffer = NSMutableData(data: data)
} else {
if receivedOpcode == OpCode.ContinueFrame.rawValue {
response!.bytesLeft = Int(dataLength)
} else {
let errCode = CloseCode.ProtocolError.rawValue
let error = self.errorWithDetail("second and beyond of fragment message must be a continue frame",
code: errCode)
self.doDisconnect(error)
writeError(errCode)
return
}
response!.buffer!.appendData(data)
}
if response != nil {
response!.bytesLeft -= Int(len)
response!.frameCount++
response!.isFin = isFin > 0 ? true : false
if(isNew) {
readStack.append(response!)
}
processResponse(response!)
}
let step = Int(offset+numericCast(len))
let extra = bufferLen-step
if(extra > 0) {
processExtra((buffer+step), bufferLen: extra)
}
}
}
///process the extra of a buffer
private func processExtra(buffer: UnsafePointer<UInt8>, bufferLen: Int) {
if bufferLen < 2 {
fragBuffer = NSData(bytes: buffer, length: bufferLen)
} else {
processRawMessage(buffer, bufferLen: bufferLen)
}
}
///process the finished response of a buffer
private func processResponse(response: WSResponse) -> Bool {
if response.isFin && response.bytesLeft <= 0 {
if response.code == .Ping {
let data = response.buffer! //local copy so it is perverse for writing
dequeueWrite(data, code: OpCode.Pong)
} else if response.code == .TextFrame {
var str: NSString? = NSString(data: response.buffer!, encoding: NSUTF8StringEncoding)
if str == nil {
writeError(CloseCode.Encoding.rawValue)
return false
}
dispatch_async(queue,{
if let textBlock = self.receivedTextBlock{
textBlock(str! as! String)
}
self.delegate?.websocketDidReceiveMessage(self, text: str! as! String)
})
} else if response.code == .BinaryFrame {
let data = response.buffer! //local copy so it is perverse for writing
dispatch_async(queue,{
if let dataBlock = self.receivedDataBlock{
dataBlock(data)
}
self.delegate?.websocketDidReceiveData(self, data: data)
})
}
readStack.removeLast()
return true
}
return false
}
///Create an error
private func errorWithDetail(detail: String, code: UInt16) -> NSError {
var details = Dictionary<String,String>()
details[NSLocalizedDescriptionKey] = detail
return NSError(domain: "Websocket", code: Int(code), userInfo: details)
}
///write a an error to the socket
private func writeError(code: UInt16) {
let buf = NSMutableData(capacity: sizeof(UInt16))
var buffer = UnsafeMutablePointer<UInt16>(buf!.bytes)
buffer[0] = code.bigEndian
dequeueWrite(NSData(bytes: buffer, length: sizeof(UInt16)), code: .ConnectionClose)
}
///used to write things to the stream
private func dequeueWrite(data: NSData, code: OpCode) {
if writeQueue == nil {
writeQueue = NSOperationQueue()
writeQueue!.maxConcurrentOperationCount = 1
}
writeQueue!.addOperationWithBlock {
//stream isn't ready, let's wait
var tries = 0;
while self.outputStream == nil || !self.connected {
if(tries < 5) {
sleep(1);
} else {
break;
}
tries++;
}
if !self.connected {
return
}
var offset = 2
UINT16_MAX
let bytes = UnsafeMutablePointer<UInt8>(data.bytes)
let dataLength = data.length
let frame = NSMutableData(capacity: dataLength + self.MaxFrameSize)
let buffer = UnsafeMutablePointer<UInt8>(frame!.mutableBytes)
buffer[0] = self.FinMask | code.rawValue
if dataLength < 126 {
buffer[1] = CUnsignedChar(dataLength)
} else if dataLength <= Int(UInt16.max) {
buffer[1] = 126
var sizeBuffer = UnsafeMutablePointer<UInt16>((buffer+offset))
sizeBuffer[0] = UInt16(dataLength).bigEndian
offset += sizeof(UInt16)
} else {
buffer[1] = 127
var sizeBuffer = UnsafeMutablePointer<UInt64>((buffer+offset))
sizeBuffer[0] = UInt64(dataLength).bigEndian
offset += sizeof(UInt64)
}
buffer[1] |= self.MaskMask
var maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
SecRandomCopyBytes(kSecRandomDefault, Int(sizeof(UInt32)), maskKey)
offset += sizeof(UInt32)
for (var i = 0; i < dataLength; i++) {
buffer[offset] = bytes[i] ^ maskKey[i % sizeof(UInt32)]
offset += 1
}
var total = 0
while true {
if self.outputStream == nil {
break
}
let writeBuffer = UnsafePointer<UInt8>(frame!.bytes+total)
var len = self.outputStream?.write(writeBuffer, maxLength: offset-total)
if len == nil || len! < 0 {
var error: NSError?
if let streamError = self.outputStream?.streamError {
error = streamError
} else {
let errCode = InternalErrorCode.OutputStreamWriteError.rawValue
error = self.errorWithDetail("output stream error during write", code: errCode)
}
self.doDisconnect(error)
break
} else {
total += len!
}
if total >= offset {
break
}
}
}
}
///used to preform the disconnect delegate
private func doDisconnect(error: NSError?) {
if self.isConnected {
dispatch_async(queue,{
if let disconnect = self.disconnectedBlock {
disconnect(error)
}
self.delegate?.websocketDidDisconnect(self, error: error)
})
}
}
}
Executable
+6
View File
@@ -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
+27
View File
@@ -0,0 +1,27 @@
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
#
# Pods/
# Xcode
.DS_Store
build
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
*.hmap
*.xccheckout
*.xcodeproj/*.xcworkspace
@@ -0,0 +1,505 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
5C178E221B62D0B900A97204 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E211B62D0B900A97204 /* AppDelegate.swift */; };
5C178E241B62D0B900A97204 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E231B62D0B900A97204 /* ViewController.swift */; };
5C178E271B62D0B900A97204 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E251B62D0B900A97204 /* Main.storyboard */; };
5C178E291B62D0B900A97204 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E281B62D0B900A97204 /* Images.xcassets */; };
5C178E2C1B62D0B900A97204 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */; };
5C178E381B62D0B900A97204 /* AutobahnTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C178E371B62D0B900A97204 /* AutobahnTests.swift */; };
5C178E521B62D11200A97204 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C178E491B62D0EF00A97204 /* Starscream.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
5C178E321B62D0B900A97204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5C178E141B62D0B900A97204 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 5C178E1B1B62D0B900A97204;
remoteInfo = Autobahn;
};
5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
remoteInfo = Starscream;
};
5C178E501B62D10A00A97204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
remoteInfo = Starscream;
};
5CF15740210A738400869246 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
remoteInfo = "Starscream Tests";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
5C178E1C1B62D0B900A97204 /* Autobahn.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Autobahn.app; sourceTree = BUILT_PRODUCTS_DIR; };
5C178E201B62D0B900A97204 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5C178E211B62D0B900A97204 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5C178E231B62D0B900A97204 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
5C178E261B62D0B900A97204 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5C178E281B62D0B900A97204 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
5C178E2B1B62D0B900A97204 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
5C178E311B62D0B900A97204 /* AutobahnTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AutobahnTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5C178E361B62D0B900A97204 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5C178E371B62D0B900A97204 /* AutobahnTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutobahnTests.swift; sourceTree = "<group>"; };
5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../../Starscream.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
5C178E191B62D0B900A97204 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5C178E521B62D11200A97204 /* Starscream.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5C178E2E1B62D0B900A97204 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
5C178E131B62D0B900A97204 = {
isa = PBXGroup;
children = (
5C178E1E1B62D0B900A97204 /* Autobahn */,
5C178E341B62D0B900A97204 /* AutobahnTests */,
5C178E1D1B62D0B900A97204 /* Products */,
5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */,
);
sourceTree = "<group>";
};
5C178E1D1B62D0B900A97204 /* Products */ = {
isa = PBXGroup;
children = (
5C178E1C1B62D0B900A97204 /* Autobahn.app */,
5C178E311B62D0B900A97204 /* AutobahnTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
5C178E1E1B62D0B900A97204 /* Autobahn */ = {
isa = PBXGroup;
children = (
5C178E211B62D0B900A97204 /* AppDelegate.swift */,
5C178E231B62D0B900A97204 /* ViewController.swift */,
5C178E251B62D0B900A97204 /* Main.storyboard */,
5C178E281B62D0B900A97204 /* Images.xcassets */,
5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */,
5C178E1F1B62D0B900A97204 /* Supporting Files */,
);
path = Autobahn;
sourceTree = "<group>";
};
5C178E1F1B62D0B900A97204 /* Supporting Files */ = {
isa = PBXGroup;
children = (
5C178E201B62D0B900A97204 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
5C178E341B62D0B900A97204 /* AutobahnTests */ = {
isa = PBXGroup;
children = (
5C178E371B62D0B900A97204 /* AutobahnTests.swift */,
5C178E351B62D0B900A97204 /* Supporting Files */,
);
path = AutobahnTests;
sourceTree = "<group>";
};
5C178E351B62D0B900A97204 /* Supporting Files */ = {
isa = PBXGroup;
children = (
5C178E361B62D0B900A97204 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
5C178E421B62D0EF00A97204 /* Products */ = {
isa = PBXGroup;
children = (
5C178E491B62D0EF00A97204 /* Starscream.framework */,
5CF15741210A738400869246 /* Starscream Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
5C178E1B1B62D0B900A97204 /* Autobahn */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5C178E3B1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "Autobahn" */;
buildPhases = (
5C178E181B62D0B900A97204 /* Sources */,
5C178E191B62D0B900A97204 /* Frameworks */,
5C178E1A1B62D0B900A97204 /* Resources */,
);
buildRules = (
);
dependencies = (
5C178E511B62D10A00A97204 /* PBXTargetDependency */,
);
name = Autobahn;
productName = Autobahn;
productReference = 5C178E1C1B62D0B900A97204 /* Autobahn.app */;
productType = "com.apple.product-type.application";
};
5C178E301B62D0B900A97204 /* AutobahnTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5C178E3E1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "AutobahnTests" */;
buildPhases = (
5C178E2D1B62D0B900A97204 /* Sources */,
5C178E2E1B62D0B900A97204 /* Frameworks */,
5C178E2F1B62D0B900A97204 /* Resources */,
);
buildRules = (
);
dependencies = (
5C178E331B62D0B900A97204 /* PBXTargetDependency */,
);
name = AutobahnTests;
productName = AutobahnTests;
productReference = 5C178E311B62D0B900A97204 /* AutobahnTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
5C178E141B62D0B900A97204 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0640;
ORGANIZATIONNAME = vluxe;
TargetAttributes = {
5C178E1B1B62D0B900A97204 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 1000;
};
5C178E301B62D0B900A97204 = {
CreatedOnToolsVersion = 6.4;
LastSwiftMigration = 1000;
TestTargetID = 5C178E1B1B62D0B900A97204;
};
};
};
buildConfigurationList = 5C178E171B62D0B900A97204 /* Build configuration list for PBXProject "Autobahn" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 5C178E131B62D0B900A97204;
productRefGroup = 5C178E1D1B62D0B900A97204 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 5C178E421B62D0EF00A97204 /* Products */;
ProjectRef = 5C178E411B62D0EF00A97204 /* Starscream.xcodeproj */;
},
);
projectRoot = "";
targets = (
5C178E1B1B62D0B900A97204 /* Autobahn */,
5C178E301B62D0B900A97204 /* AutobahnTests */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
5C178E491B62D0EF00A97204 /* Starscream.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Starscream.framework;
remoteRef = 5C178E481B62D0EF00A97204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5CF15741210A738400869246 /* Starscream Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Starscream Tests.xctest";
remoteRef = 5CF15740210A738400869246 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
5C178E1A1B62D0B900A97204 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5C178E271B62D0B900A97204 /* Main.storyboard in Resources */,
5C178E2C1B62D0B900A97204 /* LaunchScreen.xib in Resources */,
5C178E291B62D0B900A97204 /* Images.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5C178E2F1B62D0B900A97204 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
5C178E181B62D0B900A97204 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5C178E241B62D0B900A97204 /* ViewController.swift in Sources */,
5C178E221B62D0B900A97204 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5C178E2D1B62D0B900A97204 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5C178E381B62D0B900A97204 /* AutobahnTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
5C178E331B62D0B900A97204 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 5C178E1B1B62D0B900A97204 /* Autobahn */;
targetProxy = 5C178E321B62D0B900A97204 /* PBXContainerItemProxy */;
};
5C178E511B62D10A00A97204 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Starscream;
targetProxy = 5C178E501B62D10A00A97204 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
5C178E251B62D0B900A97204 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
5C178E261B62D0B900A97204 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
5C178E2A1B62D0B900A97204 /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
5C178E2B1B62D0B900A97204 /* Base */,
);
name = LaunchScreen.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
5C178E391B62D0B900A97204 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
5C178E3A1B62D0B900A97204 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
5C178E3C1B62D0B900A97204 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Autobahn/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
5C178E3D1B62D0B900A97204 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Autobahn/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_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;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
5C178E171B62D0B900A97204 /* Build configuration list for PBXProject "Autobahn" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5C178E391B62D0B900A97204 /* Debug */,
5C178E3A1B62D0B900A97204 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5C178E3B1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "Autobahn" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5C178E3C1B62D0B900A97204 /* Debug */,
5C178E3D1B62D0B900A97204 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5C178E3E1B62D0B900A97204 /* Build configuration list for PBXNativeTarget "AutobahnTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5C178E3F1B62D0B900A97204 /* Debug */,
5C178E401B62D0B900A97204 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 5C178E141B62D0B900A97204 /* Project object */;
}
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:Autobahn.xcodeproj">
</FileRef>
</Workspace>
@@ -0,0 +1,46 @@
//
// AppDelegate.swift
// Autobahn
//
// Created by Dalton Cherry on 7/24/15.
// Copyright (c) 2015 vluxe. All rights reserved.
//
import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
}
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 vluxe. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Autobahn" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="548" y="455"/>
</view>
</objects>
</document>
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Autobahn" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
</document>
@@ -0,0 +1,68 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
+47
View File
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.vluxe.$(PRODUCT_NAME:rfc1034identifier)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
@@ -0,0 +1,173 @@
//
// ViewController.swift
// Autobahn
//
// Created by Dalton Cherry on 7/24/15.
// Copyright (c) 2015 vluxe. All rights reserved.
//
import UIKit
import Starscream
class ViewController: UIViewController {
let host = "localhost:9001"
var socketArray = [WebSocket]()
var caseCount = 320 //starting cases
override func viewDidLoad() {
super.viewDidLoad()
getCaseCount()
//getTestInfo(1)
//runTest(1)
}
func removeSocket(_ s: WebSocket?) {
socketArray = socketArray.filter{$0 != s}
}
func getCaseCount() {
let s = WebSocket(url: URL(string: "ws://\(host)/getCaseCount")!, protocols: [], stream: FoundationStream()) //NetworkStream
socketArray.append(s)
s.onText = { [weak self] (text: String) in
if let c = Int(text) {
print("number of cases is: \(c)")
self?.caseCount = c
}
}
s.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
// let data = text.dataUsingEncoding(NSUTF8StringEncoding)
// do {
// let resp: AnyObject? = try NSJSONSerialization.JSONObjectWithData(data!,
// options: NSJSONReadingOptions())
// if let dict = resp as? Dictionary<String,String> {
// let num = dict["id"]
// let summary = dict["description"]
// if let n = num, let sum = summary {
// print("running case:\(caseNum) id:\(n) summary: \(sum)")
// }
// }
// } catch {
// print("error parsing the json")
// }
}
var once = false
s.onDisconnect = { [weak self, weak s] (error: Error?) in
if !once {
once = true
self?.runTest(caseNum)
}
self?.removeSocket(s)
}
s.connect()
}
func runTest(_ caseNum: Int) {
let s = createSocket("runCase",caseNum)
self.socketArray.append(s)
s.onText = { [weak s] (text: String) in
s?.write(string: text)
}
s.onData = { [weak s] (data: Data) in
s?.write(data: data)
}
var once = false
s.onDisconnect = {[weak self, weak s] (error: Error?) in
if !once {
once = true
print("case:\(caseNum) finished")
//self?.verifyTest(caseNum) //disabled since it slows down the tests
let nextCase = caseNum+1
if nextCase <= (self?.caseCount)! {
self?.runTest(nextCase)
//self?.getTestInfo(nextCase) //disabled since it slows down the tests
} else {
self?.finishReports()
}
self?.removeSocket(s)
}
}
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 finishReports() {
let s = createSocket("updateReports",0)
self.socketArray.append(s)
s.onDisconnect = { [weak self, weak s] (error: Error?) in
print("finished all the tests!")
self?.removeSocket(s)
}
s.connect()
}
func createSocket(_ cmd: String, _ caseNum: Int) -> WebSocket {
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.
}
}
@@ -1,14 +1,15 @@
//
// StarscreamTests.swift
// StarscreamTests
// AutobahnTests.swift
// AutobahnTests
//
// Created by Austin Cherry on 9/25/14.
// Copyright (c) 2014 Vluxe. All rights reserved.
// Created by Dalton Cherry on 7/24/15.
// Copyright (c) 2015 vluxe. All rights reserved.
//
import UIKit
import XCTest
class StarscreamTests: XCTestCase {
class AutobahnTests: XCTestCase {
override func setUp() {
super.setUp()
@@ -27,7 +28,7 @@ class StarscreamTests: XCTestCase {
func testPerformanceExample() {
// This is an example of a performance test case.
self.measureBlock() {
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>
+27
View File
@@ -0,0 +1,27 @@
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control?
#
# Pods/
# Xcode
.DS_Store
build
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
*.hmap
*.xccheckout
*.xcodeproj/*.xcworkspace
@@ -37,6 +37,20 @@
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 */;
@@ -129,9 +143,11 @@
isa = PBXGroup;
children = (
6B3E7A0E19D48D00006071F7 /* Starscream.framework */,
6B3E7A1019D48D00006071F7 /* StarscreamTests.xctest */,
6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */,
5C06AE8B1B08044600D41060 /* Starscream.framework */,
5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */,
5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */,
5C42C3E11D8F31DC00947AA2 /* Starscream.framework */,
5C42C3E31D8F31DC00947AA2 /* Starscream tvOSTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -164,11 +180,13 @@
5C765AD3199A6DAA003D9110 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0600;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = vluxe;
TargetAttributes = {
5C765ADA199A6DAA003D9110 = {
CreatedOnToolsVersion = 6.0;
LastSwiftMigration = 0800;
};
};
};
@@ -204,13 +222,27 @@
remoteRef = 5C06AE8A1B08044600D41060 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5C06AE8D1B08044600D41060 /* StarscreamOSXTests.xctest */ = {
5C06AE8D1B08044600D41060 /* Starscream OSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = StarscreamOSXTests.xctest;
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;
@@ -218,10 +250,10 @@
remoteRef = 6B3E7A0D19D48D00006071F7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
6B3E7A1019D48D00006071F7 /* StarscreamTests.xctest */ = {
6B3E7A1019D48D00006071F7 /* Starscream iOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = StarscreamTests.xctest;
path = "Starscream iOSTests.xctest";
remoteRef = 6B3E7A0F19D48D00006071F7 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
@@ -279,20 +311,30 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@@ -322,13 +364,21 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -336,6 +386,7 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -345,6 +396,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
@@ -357,7 +409,9 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = SimpleTest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
@@ -368,7 +422,9 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = SimpleTest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
};
name = Release;
};
@@ -11,7 +11,7 @@
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D</key>
<string>https://github.com/daltoniam/starscream.git</string>
<string>https://github.com/daltoniam/Starscream</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>examples/SimpleTest/SimpleTest.xcodeproj</string>
@@ -21,7 +21,7 @@
<string>../../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/daltoniam/starscream.git</string>
<string>https://github.com/daltoniam/Starscream</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
@@ -34,7 +34,7 @@
<key>IDESourceControlWCCIdentifierKey</key>
<string>C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D</string>
<key>IDESourceControlWCCName</key>
<string>starscream</string>
<string>Starscream</string>
</dict>
</array>
</dict>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -37,10 +37,11 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
@@ -62,17 +63,22 @@
ReferencedContainer = "container:SimpleTest.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5C765ADA199A6DAA003D9110"
@@ -81,16 +87,24 @@
ReferencedContainer = "container:SimpleTest.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "OS_ACTIVITY_MODE"
value = "disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable>
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5C765ADA199A6DAA003D9110"
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
func applicationWillResignActive(application: UIApplication) {
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}
func applicationDidEnterBackground(application: UIApplication) {
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(application: UIApplication) {
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(application: UIApplication) {
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(application: UIApplication) {
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
+1 -1
View File
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.vluxe.io.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -10,43 +10,50 @@ import UIKit
import Starscream
class ViewController: UIViewController, WebSocketDelegate {
var socket = WebSocket(url: NSURL(scheme: "ws", host: "localhost:8080", path: "/")!, protocols: ["chat", "superchat"])
var socket: WebSocket!
override func viewDidLoad() {
super.viewDidLoad()
var request = URLRequest(url: URL(string: "http://localhost:8080")!)
request.timeoutInterval = 5
socket = WebSocket(request: request)
socket.delegate = self
socket.connect()
}
// MARK: Websocket Delegate Methods.
func websocketDidConnect(ws: WebSocket) {
println("websocket is connected")
func websocketDidConnect(socket: WebSocketClient) {
print("websocket is connected")
}
func websocketDidDisconnect(ws: WebSocket, error: NSError?) {
if let e = error {
println("websocket is disconnected: \(e.localizedDescription)")
func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
if let e = error as? WSError {
print("websocket is disconnected: \(e.message)")
} else if let e = error {
print("websocket is disconnected: \(e.localizedDescription)")
} else {
print("websocket disconnected")
}
}
func websocketDidReceiveMessage(ws: WebSocket, text: String) {
println("Received text: \(text)")
func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
print("Received text: \(text)")
}
func websocketDidReceiveData(ws: WebSocket, data: NSData) {
println("Received data: \(data.length)")
func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
print("Received data: \(data.count)")
}
// MARK: Write Text Action
@IBAction func writeText(sender: UIBarButtonItem) {
socket.writeString("hello there!")
@IBAction func writeText(_ sender: UIBarButtonItem) {
socket.write(string: "hello there!")
}
// MARK: Disconnect Action
@IBAction func disconnect(sender: UIBarButtonItem) {
@IBAction func disconnect(_ sender: UIBarButtonItem) {
if socket.isConnected {
sender.title = "Connect"
socket.disconnect()
+1 -1
View File
@@ -22,4 +22,4 @@ EM.run {
ws.send Faker::Hacker.say_something_smart
}
end
}
}
+11
View File
@@ -0,0 +1,11 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'
target 'WebSocketsOrgEcho' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!
# Pods for WebSocketsOrgEcho
pod 'Starscream', :path => '../../'
end
+16
View File
@@ -0,0 +1,16 @@
PODS:
- Starscream (3.0.6)
DEPENDENCIES:
- Starscream (from `../../`)
EXTERNAL SOURCES:
Starscream:
:path: "../../"
SPEC CHECKSUMS:
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
PODFILE CHECKSUM: 96d91933fe13671aaa81af8a8675ff7698068845
COCOAPODS: 1.6.0.beta.2
@@ -0,0 +1,24 @@
{
"name": "Starscream",
"version": "3.0.6",
"summary": "A conforming WebSocket RFC 6455 client library in Swift.",
"homepage": "https://github.com/daltoniam/Starscream",
"license": "Apache License, Version 2.0",
"authors": {
"Dalton Cherry": "http://daltoniam.com",
"Austin Cherry": "http://austincherry.me"
},
"source": {
"git": "https://github.com/daltoniam/Starscream.git",
"tag": "3.0.6"
},
"social_media_url": "http://twitter.com/daltoniam",
"platforms": {
"ios": "8.0",
"osx": "10.10",
"tvos": "9.0",
"watchos": "2.0"
},
"source_files": "Sources/**/*.swift",
"swift_version": "4.2"
}
+16
View File
@@ -0,0 +1,16 @@
PODS:
- Starscream (3.0.6)
DEPENDENCIES:
- Starscream (from `../../`)
EXTERNAL SOURCES:
Starscream:
:path: "../../"
SPEC CHECKSUMS:
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
PODFILE CHECKSUM: 96d91933fe13671aaa81af8a8675ff7698068845
COCOAPODS: 1.6.0.beta.2
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
@@ -0,0 +1,182 @@
# Acknowledgements
This application makes use of the following third party libraries:
## Starscream
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.
Generated by CocoaPods - https://cocoapods.org
@@ -0,0 +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">
<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>
@@ -0,0 +1,5 @@
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_WebSocketsOrgEcho : NSObject
@end
@implementation PodsDummy_Pods_WebSocketsOrgEcho
@end
@@ -0,0 +1,163 @@
#!/bin/sh
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
fi
echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
# Used as a return value for each invocation of `strip_invalid_archs` function.
STRIP_BINARY_RETVAL=0
# This protects against multiple targets copying the same framework dependency at the same time. The solution
# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
# Copies and strips a vendored framework
install_framework()
{
if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
local source="${BUILT_PRODUCTS_DIR}/$1"
elif [ -r "${BUILT_PRODUCTS_DIR}/$(basename "$1")" ]; then
local source="${BUILT_PRODUCTS_DIR}/$(basename "$1")"
elif [ -r "$1" ]; then
local source="$1"
fi
local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
if [ -L "${source}" ]; then
echo "Symlinked..."
source="$(readlink "${source}")"
fi
# Use filter instead of exclude so missing patterns don't throw errors.
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\""
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}"
local basename
basename="$(basename -s .framework "$1")"
binary="${destination}/${basename}.framework/${basename}"
if ! [ -r "$binary" ]; then
binary="${destination}/${basename}"
elif [ -L "${binary}" ]; then
echo "Destination binary is symlinked..."
dirname="$(dirname "${binary}")"
binary="${dirname}/$(readlink "${binary}")"
fi
# Strip invalid architectures so "fat" simulator / device frameworks work on device
if [[ "$(file "$binary")" == *"dynamically linked shared library"* ]]; then
strip_invalid_archs "$binary"
fi
# Resign the code if required by the build settings to avoid unstable apps
code_sign_if_enabled "${destination}/$(basename "$1")"
# 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)
for lib in $swift_runtime_libs; do
echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\""
rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}"
code_sign_if_enabled "${destination}/${lib}"
done
fi
}
# Copies and strips a vendored dSYM
install_dsym() {
local source="$1"
if [ -r "$source" ]; then
# Copy the dSYM into a the targets temp dir.
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
local basename
basename="$(basename -s .framework.dSYM "$source")"
binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
# Strip invalid architectures so "fat" simulator / device frameworks work on device
if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
strip_invalid_archs "$binary"
fi
if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
# Move the stripped file into its final destination.
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
else
# The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
fi
fi
}
# Signs a framework with the provided identity
code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY:-}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identity
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &"
fi
echo "$code_sign_cmd"
eval "$code_sign_cmd"
fi
}
# Strip invalid architectures
strip_invalid_archs() {
binary="$1"
# Get architectures for current target binary
binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
# Intersect them with the architectures we are building for
intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
# If there are no archs supported by this binary then warn the user
if [[ -z "$intersected_archs" ]]; then
echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
STRIP_BINARY_RETVAL=0
return
fi
stripped=""
for arch in $binary_archs; do
if ! [[ "${ARCHS}" == *"$arch"* ]]; then
# Strip non-valid architectures in-place
lipo -remove "$arch" -output "$binary" "$binary"
stripped="$stripped $arch"
fi
done
if [[ "$stripped" ]]; then
echo "Stripped $binary of architectures:$stripped"
fi
STRIP_BINARY_RETVAL=1
}
if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework"
fi
if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework"
fi
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
wait
fi
@@ -0,0 +1,16 @@
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
FOUNDATION_EXPORT double Pods_WebSocketsOrgEchoVersionNumber;
FOUNDATION_EXPORT const unsigned char Pods_WebSocketsOrgEchoVersionString[];
@@ -0,0 +1,11 @@
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_LDFLAGS = $(inherited) -framework "Starscream"
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_ROOT = ${SRCROOT}/Pods
@@ -0,0 +1,6 @@
framework module Pods_WebSocketsOrgEcho {
umbrella header "Pods-WebSocketsOrgEcho-umbrella.h"
export *
module * { export * }
}
@@ -0,0 +1,11 @@
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_LDFLAGS = $(inherited) -framework "Starscream"
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_ROOT = ${SRCROOT}/Pods
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
@@ -0,0 +1,5 @@
#import <Foundation/Foundation.h>
@interface PodsDummy_Starscream : NSObject
@end
@implementation PodsDummy_Starscream
@end
@@ -0,0 +1,12 @@
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
@@ -0,0 +1,16 @@
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
FOUNDATION_EXPORT double StarscreamVersionNumber;
FOUNDATION_EXPORT const unsigned char StarscreamVersionString[];
@@ -0,0 +1,6 @@
framework module Starscream {
umbrella header "Starscream-umbrella.h"
export *
module * { export * }
}
@@ -0,0 +1,9 @@
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Starscream
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:WebSocketsOrgEcho.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
@@ -0,0 +1,21 @@
//
// AppDelegate.swift
// WebSocketsOrgEcho
//
// Created by Kristaps Grinbergs on 08/10/2018.
// Copyright © 2018 Starscream. All rights reserved.
//
import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}
}
@@ -0,0 +1,98 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="WebSocketsOrgEcho" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ysb-Wt-xJQ">
<rect key="frame" x="158" y="318.5" width="59" height="30"/>
<state key="normal" title="Connect"/>
<connections>
<action selector="connect:" destination="BYZ-38-t0r" eventType="touchUpInside" id="JK8-oU-5uC"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="ysb-Wt-xJQ" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="2YK-eB-LZR"/>
<constraint firstItem="ysb-Wt-xJQ" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="iGG-QS-5FX"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
</document>
@@ -0,0 +1,45 @@
<?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>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
@@ -0,0 +1,19 @@
//
// URL+Extensions.swift
// Example
//
// Created by Kristaps Grinbergs on 08/10/2018.
// Copyright © 2018 Kristaps Grinbergs. All rights reserved.
//
import Foundation
extension URL {
init(staticString string: StaticString) {
guard let url = URL(string: "\(string)") else {
preconditionFailure("Invalid static URL string: \(string)")
}
self = url
}
}
@@ -0,0 +1,55 @@
//
// ViewController.swift
// WebSocketsOrgEcho
//
// Created by Kristaps Grinbergs on 08/10/2018.
// Copyright © 2018 Starscream. All rights reserved.
//
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) {
print("websocketDidConnect")
}
func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
print("websocketDidDisconnect", error ?? "")
}
func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
print("websocketDidReceiveMessage", text)
}
func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
print("websocketDidReceiveData", data)
}
override func viewDidLoad() {
super.viewDidLoad()
socket.delegate = self
}
@IBAction func connect(_ sender: Any) {
socket.connect()
}
}
+28
View File
@@ -0,0 +1,28 @@
default_platform(:ios)
update_fastlane
platform :ios do
desc "Depoy new version"
lane :release do
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: github_token,
name: version,
tag_name: version,
description: changelog,
commitish: "master"
)
sh("git fetch --tags")
pod_push(allow_warnings: true, verbose: true)
end
end
+29
View File
@@ -0,0 +1,29 @@
fastlane documentation
================
# Installation
Make sure you have the latest version of the Xcode command line tools installed:
```
xcode-select --install
```
Install _fastlane_ using
```
[sudo] gem install fastlane -NV
```
or alternatively using `brew cask install fastlane`
# Available Actions
## iOS
### ios release
```
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).
Executable
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
bundle install
bundle exec fastlane release