Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: socketio/socket.io-client-swift
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v8.3.2
Choose a base ref
...
head repository: socketio/socket.io-client-swift
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 30, 2017

  1. Copy the full SHA
    d3c1d0c View commit details
  2. Merge branch 'development'

    * development:
      Revert "double encoding should be getting fixed, make the default false"
    nuclearace committed Mar 30, 2017
    Copy the full SHA
    2305089 View commit details
  3. bump version

    nuclearace committed Mar 30, 2017
    Copy the full SHA
    6bf970e View commit details
  4. actually bump version

    nuclearace committed Mar 30, 2017
    Copy the full SHA
    1949b1f View commit details

Commits on Apr 4, 2017

  1. Update README.md

    hfossli authored Apr 4, 2017
    Copy the full SHA
    9a2b59a View commit details
  2. Merge pull request #643 from hfossli/patch-1

    Fix markdown formatting issues in README.md
    nuclearace authored Apr 4, 2017
    Copy the full SHA
    6f3610e View commit details

Commits on Apr 13, 2017

  1. Copy the full SHA
    e29c904 View commit details

Commits on Apr 14, 2017

  1. Copy the full SHA
    907b1b3 View commit details
  2. Merge pull request #651 from musicabbage/development

    remove engine’s listener before assign new instance
    nuclearace authored Apr 14, 2017
    Copy the full SHA
    1669f2c View commit details

Commits on Apr 25, 2017

  1. Fixed headings

    philipengberg authored Apr 25, 2017
    Copy the full SHA
    d668da6 View commit details
  2. Merge pull request #658 from philipengberg/patch-1

    Fixed headings
    nuclearace authored Apr 25, 2017
    Copy the full SHA
    34d1e2f View commit details

Commits on May 1, 2017

  1. refactor protocol

    nuclearace committed May 1, 2017
    Copy the full SHA
    7777c76 View commit details
  2. Copy the full SHA
    c87bb40 View commit details

Commits on May 4, 2017

  1. Fix #657

    nuclearace committed May 4, 2017
    Copy the full SHA
    e5eec3e View commit details
  2. Merge branch 'master' into development

    * master:
      Fixed headings
    nuclearace committed May 4, 2017
    Copy the full SHA
    e116011 View commit details

Commits on May 6, 2017

  1. add ignore for appcode

    nuclearace committed May 6, 2017
    Copy the full SHA
    7e494f4 View commit details
  2. Make engine single queued

    Fix polling
    
    allow building of refactor branch
    
    remove self reference
    
    Some refactoring
    nuclearace committed May 6, 2017
    Copy the full SHA
    ed049e8 View commit details
  3. Make client single queued

    Shouldn't need to protoct ack generation now that client is single queued
    nuclearace committed May 6, 2017
    Copy the full SHA
    84dd307 View commit details
  4. Open client

    nuclearace committed May 6, 2017
    Copy the full SHA
    abdffb9 View commit details
  5. remove refactor build

    nuclearace committed May 6, 2017
    Copy the full SHA
    9edd322 View commit details
  6. Merge branch 'refactor-engine' into development

    * refactor-engine:
      remove refactor build
      Open client
      Make client single queued
      Make engine single queued
      add ignore for appcode
    nuclearace committed May 6, 2017
    Copy the full SHA
    58f51d0 View commit details
  7. Copy the full SHA
    23c7641 View commit details
  8. Document ack types

    nuclearace committed May 6, 2017
    Copy the full SHA
    e78200e View commit details
  9. Copy the full SHA
    08c6186 View commit details
  10. Document SocketAnyEvent

    nuclearace committed May 6, 2017
    Copy the full SHA
    a8ee018 View commit details
  11. Document SocketIOClientSwift

    add docs
    
    Start documenting engine
    
    More engine documentation
    
    Document engine
    
    document SocketEngineClient
    
    Document SocketEnginePollable and SocketEnginePacketType
    
    Document SocketEngineWebsocket
    
    Document SocketIOClient
    
    Document SocketIOClientStatus
    
    Document SocketLogger
    
    Document some typealiases
    
    Document SocketIOClientOption
    
    Document SocketIOClientConfiguration
    nuclearace committed May 6, 2017
    Copy the full SHA
    1ff8e11 View commit details
  12. Merge branch 'documentation' into development

    * documentation:
      Document SocketIOClientSwift
    nuclearace committed May 6, 2017
    Copy the full SHA
    cc3d7f8 View commit details
  13. Implement #672

    nuclearace committed May 6, 2017
    Copy the full SHA
    af5e934 View commit details

Commits on May 7, 2017

  1. Copy the full SHA
    bcce3cd View commit details
  2. Try and fix travis

    nuclearace committed May 7, 2017
    Copy the full SHA
    1c1eb3d View commit details
  3. Copy the full SHA
    77034a4 View commit details
  4. Use xctool

    nuclearace committed May 7, 2017
    Copy the full SHA
    f10839b View commit details
  5. Copy the full SHA
    2e492ee View commit details
  6. Copy the full SHA
    1eb39d6 View commit details
  7. Copy the full SHA
    158bdfb View commit details
  8. Merge branch 'development'

    * development: (24 commits)
      Add enum for client events. Resolves #675
      Add client event for status changes. Closes #668
      Remove from manager can be discarded
      Use xctool
      Go back to straight xcodebuild
      Try and fix travis
      Disable logging in tests, use xctool again
      Implement #672
      Document SocketIOClientSwift
      Document SocketAnyEvent
      Move operators inside type
      Document ack types
      Fix #667 Make no ack an enum case
      remove refactor build
      Open client
      Make client single queued
      Make engine single queued
      add ignore for appcode
      Fix #657
      Parsable doesn't have to be a client
      ...
    nuclearace committed May 7, 2017
    Copy the full SHA
    46b63b5 View commit details
  9. update docs

    nuclearace committed May 7, 2017
    Copy the full SHA
    74fa414 View commit details
  10. update docs

    nuclearace committed May 7, 2017
    Copy the full SHA
    a7c90cd View commit details
  11. bump version

    nuclearace committed May 7, 2017
    Copy the full SHA
    b6d0a15 View commit details
  12. fix method name in docs

    nuclearace committed May 7, 2017
    Copy the full SHA
    8d16a83 View commit details
  13. Fixes #676

    nuclearace committed May 7, 2017
    Copy the full SHA
    8e25c6c View commit details
  14. Copy the full SHA
    dd2167a View commit details

Commits on May 8, 2017

  1. Copy the full SHA
    7d8eb6f View commit details

Commits on May 15, 2017

  1. Merge branch 'development'

    * development:
      ack emits should allow custom types
      Report errors in SocketData to users. Resolves #677
      Fixes #676
      fix method name in docs
    nuclearace committed May 15, 2017
    Copy the full SHA
    62eeba6 View commit details
  2. update docs

    nuclearace committed May 15, 2017
    Copy the full SHA
    f2ab06f View commit details
  3. bump version

    nuclearace committed May 15, 2017
    Copy the full SHA
    87ecee1 View commit details

Commits on May 16, 2017

  1. Make addHeaders inout

    nuclearace committed May 16, 2017
    Copy the full SHA
    4abd2ab View commit details

Commits on May 20, 2017

  1. code style

    nuclearace committed May 20, 2017
    Copy the full SHA
    46a1290 View commit details
  2. Use Data instead of NSData

    nuclearace committed May 20, 2017
    Copy the full SHA
    88218e0 View commit details
  3. More Objective-c tests

    nuclearace committed May 20, 2017
    Copy the full SHA
    e6964b5 View commit details
Showing with 35,390 additions and 5,699 deletions.
  1. +19 −0 .github/workflows/swift.yml
  2. +6 −0 .gitignore
  3. +0 −1 .swift-version
  4. +7 −0 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
  5. +0 −13 .travis.yml
  6. +104 −0 CHANGELOG.md
  7. +1 −0 Cartfile
  8. +1 −0 Cartfile.resolved
  9. +16 −0 Package.resolved
  10. +13 −1 Package.swift
  11. +46 −130 README.md
  12. +18 −9 Socket.IO-Client-Swift.podspec
  13. +463 −1,030 Socket.IO-Client-Swift.xcodeproj/project.pbxproj
  14. +0 −114 Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-iOS.xcscheme
  15. +0 −113 Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/SocketIO-tvOS.xcscheme
  16. +9 −9 Socket.IO-Client-Swift.xcodeproj/xcshareddata/xcschemes/{SocketIO-Mac.xcscheme → SocketIO.xcscheme}
  17. +0 −95 Socket.IO-Test-Server/TestCases.js
  18. +0 −10 Socket.IO-Test-Server/acknowledgementEvents.js
  19. +0 −20 Socket.IO-Test-Server/emitEvents.js
  20. +0 −15 Socket.IO-Test-Server/main.js
  21. +0 −14 Socket.IO-Test-Server/package.json
  22. +0 −13 Socket.IO-Test-Server/socketEventRegister.js
  23. +0 −24 SocketIO-MacTests/Info.plist
  24. +0 −26 SocketIO-MacTests/SocketAckManagerTest.swift
  25. +0 −166 SocketIO-MacTests/SocketBasicPacketTest.swift
  26. +0 −126 SocketIO-MacTests/SocketEngineTest.swift
  27. +0 −141 SocketIO-MacTests/SocketNamespacePacketTest.swift
  28. +0 −53 SocketIO-MacTests/SocketObjectiveCTest.m
  29. +0 −168 SocketIO-MacTests/SocketSideEffectTest.swift
  30. +0 −26 SocketIO-iOS/Info.plist
  31. +0 −19 SocketIO-iOS/SocketIO.h
  32. 0 {SocketIO-Mac → SocketIO}/Info.plist
  33. +1 −1 SocketIO-Mac/SocketIO-Mac.h → SocketIO/SocketIO.h
  34. +0 −259 Source/SSLSecurity.swift
  35. +0 −87 Source/SocketAckEmitter.swift
  36. +0 −82 Source/SocketClientManager.swift
  37. +0 −560 Source/SocketEngine.swift
  38. +0 −232 Source/SocketEnginePollable.swift
  39. +0 −115 Source/SocketEngineSpec.swift
  40. +0 −62 Source/SocketEngineWebsocket.swift
  41. +146 −0 Source/SocketIO/Ack/SocketAckEmitter.swift
  42. +40 −31 Source/{ → SocketIO/Ack}/SocketAckManager.swift
  43. +11 −1 Source/{ → SocketIO/Client}/SocketAnyEvent.swift
  44. +21 −6 Source/{ → SocketIO/Client}/SocketEventHandler.swift
  45. +549 −0 Source/SocketIO/Client/SocketIOClient.swift
  46. +60 −30 Source/{ → SocketIO/Client}/SocketIOClientConfiguration.swift
  47. +112 −25 Source/{ → SocketIO/Client}/SocketIOClientOption.swift
  48. +392 −0 Source/SocketIO/Client/SocketIOClientSpec.swift
  49. +33 −6 Source/{SocketIOClientStatus.swift → SocketIO/Client/SocketIOStatus.swift}
  50. +163 −0 Source/SocketIO/Client/SocketRawView.swift
  51. +778 −0 Source/SocketIO/Engine/SocketEngine.swift
  52. +40 −1 Source/{ → SocketIO/Engine}/SocketEngineClient.swift
  53. +23 −3 Source/{ → SocketIO/Engine}/SocketEnginePacketType.swift
  54. +262 −0 Source/SocketIO/Engine/SocketEnginePollable.swift
  55. +209 −0 Source/SocketIO/Engine/SocketEngineSpec.swift
  56. +87 −0 Source/SocketIO/Engine/SocketEngineWebsocket.swift
  57. +613 −0 Source/SocketIO/Manager/SocketManager.swift
  58. +148 −0 Source/SocketIO/Manager/SocketManagerSpec.swift
  59. +103 −59 Source/{ → SocketIO/Parse}/SocketPacket.swift
  60. +181 −0 Source/SocketIO/Parse/SocketParsable.swift
  61. +27 −22 Source/{ → SocketIO/Util}/SocketExtensions.swift
  62. +32 −18 Source/{ → SocketIO/Util}/SocketLogger.swift
  63. +27 −27 Source/{ → SocketIO/Util}/SocketStringReader.swift
  64. +86 −0 Source/SocketIO/Util/SocketTypes.swift
  65. +0 −450 Source/SocketIOClient.swift
  66. +0 −43 Source/SocketIOClientSpec.swift
  67. +0 −168 Source/SocketParsable.swift
  68. +0 −52 Source/SocketTypes.swift
  69. +0 −955 Source/WebSocket.swift
  70. +50 −0 Tests/TestSocketIO/SocketAckManagerTest.swift
  71. +215 −0 Tests/TestSocketIO/SocketBasicPacketTest.swift
  72. +229 −0 Tests/TestSocketIO/SocketEngineTest.swift
  73. +14 −14 {SocketIO-MacTests → Tests/TestSocketIO}/SocketIOClientConfigurationTest.swift
  74. +247 −0 Tests/TestSocketIO/SocketMangerTest.swift
  75. +206 −0 Tests/TestSocketIO/SocketNamespacePacketTest.swift
  76. +52 −54 {SocketIO-MacTests → Tests/TestSocketIO}/SocketParserTest.swift
  77. +507 −0 Tests/TestSocketIO/SocketSideEffectTest.swift
  78. +13 −0 Tests/TestSocketIO/utils.swift
  79. +109 −0 Usage Docs/12to13.md
  80. +35 −0 Usage Docs/15to16.md
  81. +61 −0 Usage Docs/Compatibility.md
  82. +44 −0 Usage Docs/FAQ.md
  83. +335 −0 docs/12to13.html
  84. +255 −0 docs/15to16.html
  85. +526 −0 docs/Classes.html
  86. +337 −0 docs/Classes/OnAckCallback.html
  87. +436 −0 docs/Classes/SSLSecurity.html
  88. +518 −0 docs/Classes/SocketAckEmitter.html
  89. +354 −0 docs/Classes/SocketAnyEvent.html
  90. +472 −0 docs/Classes/SocketClientManager.html
  91. +1,640 −0 docs/Classes/SocketEngine.html
  92. +1,856 −0 docs/Classes/SocketIOClient.html
  93. +1,738 −0 docs/Classes/SocketManager.html
  94. +362 −0 docs/Classes/SocketRawAckView.html
  95. +532 −0 docs/Classes/SocketRawView.html
  96. +453 −0 docs/Enums.html
  97. +352 −0 docs/Enums/SocketAckStatus.html
  98. +572 −0 docs/Enums/SocketClientEvent.html
  99. +452 −0 docs/Enums/SocketEnginePacketType.html
  100. +976 −0 docs/Enums/SocketIOClientOption.html
  101. +316 −0 docs/Enums/SocketIOClientStatus.html
  102. +449 −0 docs/Enums/SocketIOStatus.html
  103. +316 −0 docs/Enums/SocketIOVersion.html
  104. +352 −0 docs/Enums/SocketParsableError.html
  105. +567 −0 docs/Extensions.html
  106. +282 −0 docs/Guides.html
  107. +593 −0 docs/Protocols.html
  108. +317 −0 docs/Protocols/ConfigSettable.html
  109. +319 −0 docs/Protocols/SocketData.html
  110. +303 −0 docs/Protocols/SocketDataBufferable.html
  111. +656 −0 docs/Protocols/SocketEngineClient.html
  112. +583 −0 docs/Protocols/SocketEnginePollable.html
  113. +1,242 −0 docs/Protocols/SocketEngineSpec.html
  114. +408 −0 docs/Protocols/SocketEngineWebsocket.html
  115. +1,802 −0 docs/Protocols/SocketIOClientSpec.html
  116. +467 −0 docs/Protocols/SocketLogger.html
  117. +1,070 −0 docs/Protocols/SocketManagerSpec.html
  118. +502 −0 docs/Protocols/SocketParsable.html
  119. +339 −0 docs/Structs.html
  120. +435 −0 docs/Structs/SocketEventHandler.html
  121. +770 −0 docs/Structs/SocketIOClientConfiguration.html
  122. +558 −0 docs/Structs/SocketPacket.html
  123. +500 −0 docs/Structs/SocketPacket/PacketType.html
  124. +336 −0 docs/Typealiases.html
  125. +28 −0 docs/badge.svg
  126. +200 −0 docs/css/highlight.css
  127. +395 −0 docs/css/jazzy.css
  128. +284 −0 docs/faq.html
  129. BIN docs/img/carat.png
  130. BIN docs/img/dash.png
  131. BIN docs/img/gh.png
  132. BIN docs/img/spinner.gif
  133. +363 −0 docs/index.html
  134. +70 −0 docs/js/jazzy.js
  135. +70 −0 docs/js/jazzy.search.js
  136. +2 −0 docs/js/jquery.min.js
  137. +6 −0 docs/js/lunr.min.js
  138. +1,694 −0 docs/js/typeahead.jquery.js
  139. +1 −0 docs/search.json
19 changes: 19 additions & 0 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Swift

on:
push:
branches: [ "master", "development" ]
pull_request:
branches: [ "master", "development" ]

jobs:
build:

runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- name: Build
run: swift build -v
- name: Run tests
run: swift test -v
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -46,3 +46,9 @@ DerivedData
*.xcuserstate

Socket.IO-Test-Server/node_modules/*

.idea/
docs/docsets/
docs/undocumented.json

.swiftpm
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

104 changes: 104 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# v16.1.0

- Remove support for iOS 11.
- Update to Starscream 4.0.6

# v16.0.0

- Removed Objective-C support. It's time for you to embrace Swift.
- Socket.io 3 support.

# v15.3.0

- Add `==` operators for `SocketAckStatus` and `String`

# v15.2.0

- Small fixes.

# v15.1.0

- Add ability to enable websockets SOCKS proxy.
- Fix emit completion callback not firing on websockets [#1178](https://github.com/socketio/socket.io-client-swift/issues/1178)

# v15.0.0

- Swift 5

# v14.0.0

- Minimum version of the client is now Swift 4.2.
- Add exponential backoff for reconnects, with `reconnectWaitMax` and `randomizationFactor` options [#1149](https://github.com/socketio/socket.io-client-swift/pull/1149)
- `statusChange` event's data format adds a second value, the raw value of the status. This is for use in Objective-C. [#1147](https://github.com/socketio/socket.io-client-swift/issues/1147)

# v13.4.0

- Add emits with write completion handlers. [#1096](https://github.com/socketio/socket.io-client-swift/issues/1096)
- Add ability to listen for when a websocket upgrade happens

# v13.3.1

- Fixes various bugs. [#857](https://github.com/socketio/socket.io-client-swift/issues/857), [#1078](https://github.com/socketio/socket.io-client-swift/issues/1078)

# v13.3.0

- Copy cookies from polling to WebSockets ([#1057](https://github.com/socketio/socket.io-client-swift/issues/1057), [#1058](https://github.com/socketio/socket.io-client-swift/issues/1058))

# v13.2.1

- Fix packets getting lost when WebSocket upgrade fails. [#1033](https://github.com/socketio/socket.io-client-swift/issues/1033)
- Fix bad unit tests. [#794](https://github.com/socketio/socket.io-client-swift/issues/794)

# v13.2.0

- Add ability to bypass Data inspection in emits. [#992]((https://github.com/socketio/socket.io-client-swift/issues/992))
- Allow `SocketEngine` to be subclassed

# v13.1.3

- Fix setting reconnectAttempts [#989]((https://github.com/socketio/socket.io-client-swift/issues/989))


# v13.1.2

- Fix [#950](https://github.com/socketio/socket.io-client-swift/issues/950)
- Conforming to `SocketEngineWebsocket` no longer requires conforming to `WebsocketDelegate`


# v13.1.1

- Fix [#923](https://github.com/socketio/socket.io-client-swift/issues/923)
- Fix [#894](https://github.com/socketio/socket.io-client-swift/issues/894)

# v13.1.0

- Allow setting `SocketEngineSpec.extraHeaders` after init.
- Deprecate `SocketEngineSpec.websocket` in favor of just using the `SocketEngineSpec.polling` property.
- Enable bitcode for most platforms.
- Fix [#882](https://github.com/socketio/socket.io-client-swift/issues/882). This adds a new method
`SocketManger.removeSocket(_:)` that should be called if when you no longer wish to use a socket again.
This will cause the engine to no longer keep a strong reference to the socket and no longer track it.

# v13.0.1

- Fix not setting handleQueue on `SocketManager`

# v13.0.0

Checkout out the migration guide in Usage Docs for a more detailed guide on how to migrate to this version.

What's new:
---

- Adds a new `SocketManager` class that multiplexes multiple namespaces through a single engine.
- Adds `.sentPing` and `.gotPong` client events for tracking ping/pongs.
- watchOS support.

Important API changes
---

- Many properties that were previously on `SocketIOClient` have been moved to the `SocketManager`.
- `SocketIOClientOption.nsp` has been removed. Use `SocketManager.socket(forNamespace:)` to create/get a socket attached to a specific namespace.
- Adds `.sentPing` and `.gotPong` client events for tracking ping/pongs.
- Makes the framework a single target.
- Updates Starscream to 3.0
1 change: 1 addition & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "daltoniam/Starscream" ~> 4.0.8
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "daltoniam/Starscream" "4.0.8"
16 changes: 16 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "Starscream",
"repositoryURL": "https://github.com/daltoniam/Starscream",
"state": {
"branch": null,
"revision": "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
"version": "4.0.8"
}
}
]
},
"version": 1
}
14 changes: 13 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
// swift-tools-version:5.4

import PackageDescription

let package = Package(
name: "SocketIO"
name: "SocketIO",
products: [
.library(name: "SocketIO", targets: ["SocketIO"])
],
dependencies: [
.package(url: "https://github.com/daltoniam/Starscream", .upToNextMajor(from: "4.0.8")),
],
targets: [
.target(name: "SocketIO", dependencies: ["Starscream"]),
.testTarget(name: "TestSocketIO", dependencies: ["SocketIO"]),
]
)
Loading