1 files changed, 53 insertions, 21 deletions
diff --git a/gitautodeploy/wsserver.py b/gitautodeploy/wsserver.py
index 3198c18..1c1e0ec 100644
--- a/gitautodeploy/wsserver.py
+++ b/gitautodeploy/wsserver.py
@@ -1,21 +1,53 @@
-from SimpleWebSocketServer import WebSocket
-
-clients = []
-class WebSocketClientHandler(WebSocket):
-
-    def handleMessage(self):
-        for client in clients:
-            if client != self:
-                client.sendMessage(self.address[0] + u' - ' + self.data)
-
-    def handleConnected(self):
-        print (self.address, 'connected')
-        for client in clients:
-            client.sendMessage(self.address[0] + u' - connected')
-            clients.append(self)
-
-    def handleClose(self):
-        clients.remove(self)
-        print (self.address, 'closed')
-        for client in clients:
-            client.sendMessage(self.address[0] + u' - disconnected')
+try:
+    from autobahn.websocket import WebSocketServerProtocol
+except ImportError:
+    WebSocketServerProtocol = object
+
+def WebSocketClientHandlerFactory(config, clients, event_store):
+    """Factory method for webhook request handler class"""
+
+    class WebSocketClientHandler(WebSocketServerProtocol, object):
+        from .events import SystemEvent
+
+        def __init__(self, *args, **kwargs):
+            self._config = config
+            self.clients = clients
+            self.event_store = event_store
+            import logging
+            self.logger = logging.getLogger()
+            super(WebSocketClientHandler, self).__init__(*args, **kwargs)
+
+        def onConnect(self, request):
+            self.logger.info("Client connecting: {0}".format(request.peer))
+
+            # Validate the request
+            if not self._config['web-ui-enabled'] or not self.peer.host in self._config['web-ui-whitelist']:
+                self.sendClose()
+                logger.info("Unautorized connection attempt from %s" % self.peer.host)
+                return
+
+            self.clients.append(self)
+
+        def onOpen(self):
+            self.logger.info("WebSocket connection open.")
+
+        def onMessage(self, payload, isBinary):
+            self.logger.info("WebSocket connection open.")
+            if isBinary:
+                self.logger.info("Binary message received: {0} bytes".format(len(payload)))
+            else:
+                self.logger.info("Text message received: {0}".format(payload.decode('utf8')))
+
+            for client in self.clients:
+                client.sendMessage(payload, isBinary)
+
+            # echo back message verbatim
+            self.sendMessage(payload, isBinary)
+
+        def onClose(self, wasClean, code, reason):
+            self.logger.info("WebSocket connection closed: {0}".format(reason))
+
+            if self in self.clients:
+                self.clients.remove(self)
+
+    return WebSocketClientHandler