Skip to content

Allow DDP client to pass http headers to ws4py, and automatically add http Host header (to support going through a reverse proxy) #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theblazehen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow DDP client to pass http headers to ws4py, and automatically add http Host header (to support going through a reverse proxy) #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bf2ade
Allow DDP client to pass http headers to ws4py
May 6, 2016
a7d30e5
Automatically add http host header
May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions DDPClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import ejson
import time
import socket
import re

from ws4py.exc import WebSocketException
from ws4py.client.threadedclient import WebSocketClient
Expand All @@ -11,13 +12,13 @@

class DDPSocket(WebSocketClient, EventEmitter):
"""DDPSocket"""
def __init__(self, url, debug=False):
def __init__(self, url, debug=False, headers=None):
self.debug = debug
# by default socket connections don't timeout. this causes issues
# where reconnects can get stuck
# TODO: make this configurable?
socket.setdefaulttimeout(10)
WebSocketClient.__init__(self, url)
WebSocketClient.__init__(self, url, headers=headers)
EventEmitter.__init__(self)

def opened(self):
Expand Down Expand Up @@ -56,7 +57,7 @@ def once(self):

class DDPClient(EventEmitter):
"""An event driven ddp client"""
def __init__(self, url, auto_reconnect=True, auto_reconnect_timeout=0.5, debug=False):
def __init__(self, url, auto_reconnect=True, auto_reconnect_timeout=0.5, debug=False, headers=None):
EventEmitter.__init__(self)
self.ddpsocket = None
self._ddp_version_index = 0
Expand All @@ -67,11 +68,16 @@ def __init__(self, url, auto_reconnect=True, auto_reconnect_timeout=0.5, debug=F
self.auto_reconnect = auto_reconnect
self.auto_reconnect_timeout = auto_reconnect_timeout
self.debug = debug
self.headers = [('Host', self._get_domain_from_url(self.url))].append(headers)
self._session = None
self._uniq_id = 0
self._callbacks = {}
self._init_socket()

def _get_domain_from_url(self, url):
p = re.compile('ws.://(.*?)/')
return p.match(url).group(1)

def _init_socket(self):
"""Initialize the ddp socket"""
# destroy the connection if it already exists
Expand All @@ -83,7 +89,7 @@ def _init_socket(self):
self.ddpsocket = None

# create a ddp socket and subscribe to events
self.ddpsocket = DDPSocket(self.url, self.debug)
self.ddpsocket = DDPSocket(self.url, self.debug, headers=self.headers)
self.ddpsocket.on('received_message', self.received_message)
self.ddpsocket.on('closed', self.closed)
self.ddpsocket.on('opened', self.opened)
Expand Down