From 8483f249eeea6c5d9b49cdf952210cd8fe1e92a9 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Fri, 20 Mar 2015 19:08:35 +0000
Subject: [PATCH] Actually proxy websocket connections

---
 .../Features/RealTimeProxy/RealTimeProxyRouter.coffee | 11 ++++++++++-
 services/web/app/views/project/editor.jade            |  1 -
 services/web/config/settings.defaults.coffee          |  8 --------
 .../coffee/ide/connection/ConnectionManager.coffee    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/services/web/app/coffee/Features/RealTimeProxy/RealTimeProxyRouter.coffee b/services/web/app/coffee/Features/RealTimeProxy/RealTimeProxyRouter.coffee
index 27beb37f0a..4fbf06c091 100644
--- a/services/web/app/coffee/Features/RealTimeProxy/RealTimeProxyRouter.coffee
+++ b/services/web/app/coffee/Features/RealTimeProxy/RealTimeProxyRouter.coffee
@@ -3,10 +3,19 @@ settings = require "settings-sharelatex"
 httpProxy = require('http-proxy');
 proxy = httpProxy.createProxyServer({
 	target: settings.apis.realTime.url
+})
+wsProxy = httpProxy.createProxyServer({
+	target: settings.apis.realTime.url.replace("http://", "ws://")
 	ws: true
 })
 
 module.exports =
 	apply: (app) ->
 		app.all /\/socket\.io\/.*/, (req, res, next) ->
-			proxy.web req, res, next
\ No newline at end of file
+			proxy.web req, res, next
+			
+		setTimeout () ->
+			Server = require "../../infrastructure/Server"
+			Server.server.on "upgrade", (req, socket, head) ->
+				wsProxy.ws req, socket, head
+		, 0
\ No newline at end of file
diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade
index 8d49bbf9d2..9af36e82f4 100644
--- a/services/web/app/views/project/editor.jade
+++ b/services/web/app/views/project/editor.jade
@@ -81,7 +81,6 @@ block content
 	//- and doesn't prematurely end the script tag.
 	script(type='text/javascript').
 		window.project_id = "!{project_id}";
-		window.websocketsUrl = "!{settings.websocketsUrl}";
 		window.userSettings = !{JSON.stringify(userSettings).replace(/\//g, '\\/')};
 		window.user = !{JSON.stringify(user).replace(/\//g, '\\/')};
 		window.csrfToken = "!{csrfToken}";
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index f5628b2479..b55705daa5 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -105,14 +105,6 @@ module.exports =
 			
 	templates:
 		user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2"
-		
-	# The websocket layer of ShareLaTeX runs as separate service.
-	# When running locally or in development, you can point the client to this
-	# service directly. If you are running behind a reverse proxy (Nginx, etc)
-	# then websocketsUrl should be the same as siteUrl, with your reverse
-	# proxy responible for sending websocket traffic to the websocket service
-	# rather than connecting directly.
-	websocketsUrl: "http://localhost:3026"
 
 	# Where your instance of ShareLaTeX can be found publically. Used in emails
 	# that are sent out, generated links, etc.
diff --git a/services/web/public/coffee/ide/connection/ConnectionManager.coffee b/services/web/public/coffee/ide/connection/ConnectionManager.coffee
index 01bc6275bd..9aa0513b09 100644
--- a/services/web/public/coffee/ide/connection/ConnectionManager.coffee
+++ b/services/web/public/coffee/ide/connection/ConnectionManager.coffee
@@ -22,7 +22,7 @@ define [], () ->
 			@$scope.$on "editor:change", () =>
 				@lastUpdated = new Date()
 
-			@ide.socket = io.connect window.websocketsUrl,
+			@ide.socket = io.connect null,
 				reconnect: false
 				"force new connection": true