! fix websocket

grrrisu · Mar 30, 2016 · 53b5ba1 · 53b5ba1
1 parent 1f1198e
commit 53b5ba1
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/node/lib/web_socket.js b/node/lib/web_socket.js
@@ -3,6 +3,21 @@
 const retry = require('retry');
 const unix_socket = require('./unix_socket');
 
+const connect_to_unix_socket = function(socket_file, callback){
+  let operation = retry.operation();
+  operation.attempt(function(currentAttempt){
+    unix_socket.connect(socket_file, (err, socket) => {
+      if(operation.retry(err)){
+        client.emit("net-status", {message: "sim server is not available", key: "server_away", error: err});
+        return;
+      } else {
+        callback(socket);
+      }
+    });
+
+  });
+};
+
 exports.connect = function(server, socket_file){
 
   const io = require('socket.io')(server);
@@ -17,7 +32,7 @@ exports.connect = function(server, socket_file){
       console.log(id + " : " + token + " joined");
       player_id = id;
 
-      connect_unix_socket(socket_file, (socket) => {
+      connect_to_unix_socket(socket_file, (socket) => {
         serverConnection = socket;
         serverConnection.browserConnection = client;
         client.emit("net-status", {message: "connected to sim server", key: "server_connected", error: null});
@@ -43,18 +58,3 @@ exports.connect = function(server, socket_file){
   });
 
 };
-
-connect_to_unix_socket(socket_file, callback){
-  let operation = retry.operation();
-  operation.attempt(function(currentAttempt){
-    unix_socket.connect(socket_file, (err, socket) => {
-      if(operation.retry(err)){
-        client.emit("net-status", {message: "sim server is not available", key: "server_away", error: err});
-        return;
-      } else {
-        callback(socket);
-      }
-    });
-
-  });
-}