255 Commits

Author SHA1 Message Date
Erik
373c1a3447
bump websocket 2017-03-29 12:20:28 -04:00
Erik
9e94ed1cea
Bump websocket version, fix some warnings 2017-03-28 05:10:46 -04:00
Alexander Levin
99faafe723 SocketAckManager thread-safe acks removal 2017-03-06 19:57:19 +02:00
Alexander Levin
fcb2b6bbf6 thread-safe ack generation 2017-02-23 09:32:50 +02:00
Erik
cce88ae3eb
bump websocket 2017-02-12 12:13:21 -05:00
Erik Little
1616a58bd7
Fix building on xcode8.3 2017-01-30 12:13:02 -05:00
Erik
0fcb7903bb
double encoding should be getting fixed, make the default false 2017-01-23 16:48:37 -05:00
Erik
3db37023c7
Merge branch 'master' into development
* master:
  Update SocketEngine.swift
  Update SocketEngine.swift
2017-01-23 16:44:02 -05:00
Erik
9a05f794f7
bump websocket 2016-12-30 19:49:23 -05:00
Vladislav Khorev
f943f41895 Update SocketEngine.swift
Fix issue #101
Place code in handleOpen, according to suggestion:
https://github.com/socketio/socket.io-client-swift/pull/602#issuecomment-269233001
2016-12-30 19:49:48 +03:00
Vladislav Khorev
494f3fa199 Update SocketEngine.swift
Fix issue #101
https://github.com/socketio/socket.io-client-swift/issues/101
2016-12-26 12:40:14 +03:00
Erik
b1debdf912
bump ws, fix #598 2016-12-18 20:06:12 -05:00
Erik
077de02345
remove namespace from socket id 2016-11-24 08:15:17 -05:00
Erik
56278795ea
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
* 'development' of https://github.com/socketio/socket.io-client-swift:
  SocketAckEmitter.isExpected => .expected
  change isRequired() to isExpected()
  remove semicolon
  Update README.md
  add SocketAckEmitter.isRequired()
  Update README.md
  bump version
  bump websocket version
  fix Use Legacy Swift issue
  bump websocket version
  Update README.md
2016-11-11 15:52:48 -05:00
Erik
a82f27ab8c
Fix #562 2016-11-11 15:52:36 -05:00
Nader Toukabri
ea3fca3767 SocketAckEmitter.isExpected => .expected 2016-10-28 15:59:50 +01:00
Nader Toukabri
efad448fab change isRequired() to isExpected() 2016-10-28 15:14:07 +01:00
Nader Toukabri
018c993a9d remove semicolon 2016-10-28 15:09:21 +01:00
Nader Toukabri
ff12285e94 add SocketAckEmitter.isRequired() 2016-10-28 14:23:22 +01:00
Erik Little
8042053331
bump websocket version 2016-10-27 06:37:39 -04:00
Erik Little
3e3ba60165
bump websocket version 2016-10-12 11:55:44 -04:00
Erik
a32f2d34f0
Fix #521 2016-10-01 10:20:13 -04:00
Erik
b3da89d61c
remove redundant cast 2016-09-25 12:10:29 -04:00
Erik
c91a79fe5b
remove redundant cast 2016-09-25 12:07:55 -04:00
Erik
6771f59ab7
Redo emitWithAck API since in Swift 3 parameter names aren't apart of the type 2016-09-25 11:59:10 -04:00
Erik
8ba3518fbc
fix objective-c 2016-09-20 16:57:09 -04:00
Erik
b33e73f119
bump websocket 2016-09-19 19:00:52 -04:00
Erik
549df19d4a
Fix adding / to path 2016-09-19 18:52:13 -04:00
Erik
723129b639
refactor 2016-09-14 07:16:22 -04:00
Erik
72b6565510
refactors 2016-09-10 10:12:37 -04:00
Erik
31adcd4728
clean up some things before xcode8 release 2016-09-10 09:17:50 -04:00
Erik Little
a55e9ab3ba
Merge branch 'development' into swift3
* development:
  Don't parse twice for errors
  use guarded try
  change spm name
  Modify mac version base mac os 10.9
2016-09-08 07:30:28 -04:00
Kevin Cassidy Jr
d808d8f157 Fix truncation of binary data, use range operator for clarity 2016-09-07 20:19:55 -07:00
David Beck
bc929b7c26 Merge branch 'swift3' of github.com:socketio/socket.io-client-swift into swift3
# Conflicts:
#	Source/SocketTypes.swift
2016-09-07 14:21:10 -07:00
David Beck
ffcf5fbf92 Update for Xcode 8 GM 2016-09-07 14:19:53 -07:00
Erik
16eefa4abf
Don't parse twice for errors 2016-09-02 18:03:15 -04:00
Erik
49dfd7432c
use guarded try 2016-09-02 17:57:26 -04:00
Erik
a950656112
open socket manager 2016-08-31 20:45:15 -04:00
Erik
c7d75b6b83
refactor 2016-08-31 19:58:40 -04:00
Erik
f5cf2b8de5
Fix swift3 errors that happened during merge 2016-08-31 18:19:24 -04:00
Erik
bd192b9af5
merge development 2016-08-31 18:13:31 -04:00
Erik
cf12865aa0
fix sid bug 2016-08-29 05:10:03 -04:00
Erik
2200972f4d
Fix socketio/socket.io-client-swift#472 2016-08-28 08:29:00 -04:00
Erik
bd7f94333d
Refactor engine. Fix infinite recursion in configuration 2016-08-27 13:05:22 -04:00
Erik
4de7a48e87
Don't send whole packet to handleConnect 2016-08-27 11:37:13 -04:00
David Beck
59c158119a Merge branch 'swift3' of github.com:socketio/socket.io-client-swift into swift3
# Conflicts:
#	SocketIO-MacTests/SocketBasicPacketTest.swift
#	SocketIO-MacTests/SocketNamespacePacketTest.swift
#	Source/SocketExtensions.swift
#	Source/SocketPacket.swift
#	Source/WebSocket.swift
2016-08-23 10:53:50 -07:00
David Beck
536367392f Switch to using Any instead of AnyObject
In Swift 3 AnyObject is rarely what you want to use. Objective-C API gets imported as Any and while types like Array and Dictionary can be coerced to AnyObject, they prefer Any, which doesn’t require a manual cast.
2016-08-23 10:10:33 -07:00
Erik
f982e756c2
varios tweaks 2016-08-20 17:58:52 -04:00
Erik
29670af4d3
fix crash 2016-08-20 16:16:57 -04:00
Erik
70b870690e
Fix websocket 2016-08-20 15:30:07 -04:00