hopefully prevent a crash

pgbovine · pgbovine · commit a7ddacccbda2 · 2017-11-07T04:48:24.000Z
diff --git a/v3/opt_togetherjs/server.js b/v3/opt_togetherjs/server.js
@@ -233,7 +233,7 @@ var server = http.createServer(function(request, response) {
         request.headers['x-forwarded-for'] ||
         request.connection.remoteAddress ||
         request.socket.remoteAddress ||
-        request.connection.socket.remoteAddress;
+        (req.connection.socket ? req.connection.socket.remoteAddress ? null);
       uniqueId = 'IP_' + ip;
     }
     allRecentHelpQueueQueries.add(uniqueId);
@@ -496,7 +496,7 @@ wsServer.on('request', function(request) {
           request.headers['x-forwarded-for'] ||
           request.connection.remoteAddress ||
           request.socket.remoteAddress ||
-          request.connection.socket.remoteAddress;
+          (req.connection.socket ? req.connection.socket.remoteAddress ? null);
         uniqueId = 'IP_' + ip;
       }
       if (bannedUsers.indexOf(uniqueId) < 0) {
@@ -516,7 +516,8 @@ wsServer.on('request', function(request) {
         request.headers['x-forwarded-for'] ||
         request.connection.remoteAddress ||
         request.socket.remoteAddress ||
-        request.connection.socket.remoteAddress;
+        (req.connection.socket ? req.connection.socket.remoteAddress ? null);
+
 
       requestFunc("http://freegeoip.net/json/" + String(ip), function(error, resp, body) {
         var geoResult;
@@ -722,7 +723,7 @@ function createLogEntry(req, event_type) {
     req.headers['x-forwarded-for'] ||
     req.connection.remoteAddress ||
     req.socket.remoteAddress ||
-    req.connection.socket.remoteAddress;
+    (req.connection.socket ? req.connection.socket.remoteAddress ? null);
 
   obj.ip = ip;
   obj.date = (new Date()).toISOString();
