jyapayne/socketIO-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for forcing websocket connections if available. Also fixed a small bug that seemed to be causing a race condition on first connections due to a failure to consume a packet on opening the default namespace

Browse source
This commit is contained in:
Sean Arietta 2014-12-25 23:27:19 -08:00
commit ef64649a2a
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
socketIO_client/__init__.py
View file

@ -138,11 +138,16 @@ class SocketIO(object):
""" """
def __init__( def __init__(
self, host, port=None, Namespace=BaseNamespace, self, host,
wait_for_connection=True, **kw): port = None,
Namespace = BaseNamespace,
wait_for_connection = True,
force_websockets_if_available = True,
**kw):
self.is_secure, self.base_url = _parse_host(host, port) self.is_secure, self.base_url = _parse_host(host, port)
self.wait_for_connection = wait_for_connection self.wait_for_connection = wait_for_connection
self._namespace_by_path = {} self._namespace_by_path = {}
self.force_websockets_if_available = force_websockets_if_available;
self.kw = kw self.kw = kw
self.__transport = None; self.__transport = None;
@ -161,6 +166,7 @@ class SocketIO(object):
# This sets of a chain of events that attempts to connect to # This sets of a chain of events that attempts to connect to
# the server at the base namespace. # the server at the base namespace.
self.define(Namespace) self.define(Namespace)
self._transport.connect("");
# Events that fail to emit due to connection errors will be # Events that fail to emit due to connection errors will be
# placed in this 'queue' and re-sent automatically upon # placed in this 'queue' and re-sent automatically upon
@ -497,7 +503,7 @@ class SocketIO(object):
# synchronization to ensure buffers are flushed, etc. # synchronization to ensure buffers are flushed, etc.
num_retries = 0; num_retries = 0;
if "websocket" in self.session.server_supported_transports: if "websocket" in self.session.server_supported_transports:
while num_retries < MAX_UPGRADE_RETRIES: while num_retries < MAX_UPGRADE_RETRIES or self.force_websockets_if_available:
try: try:
transport = self._upgrade(); transport = self._upgrade();
break; break;

1
socketIO_client/transports.py
View file

@ -61,6 +61,7 @@ class _AbstractTransport(object):
self._packets.append(packet); self._packets.append(packet);
else: else:
self.send_packet(PacketType.OPEN, path, data); self.send_packet(PacketType.OPEN, path, data);
self.recv().next();
def send_heartbeat(self): def send_heartbeat(self):
self.send_packet(PacketType.PING) self.send_packet(PacketType.PING)