Fix issues #72 - Callback already called

client/src/message-handler.js

@@ -61,8 +61,8 @@ function handleRequest(data, fs, syncObject, syncSession, socket, callback) {
     // UPSTREAM - DIFFS
     handleDiffRequest();
   } else {
-    syncObject.state = sync.SYNC_ERROR;
+    syncObject.state = syncObject.SYNC_ERROR;
-    syncObject.emit('error', new Error(data.content));
+    syncObject.emit('error', data.content);
   }
 }
 

client/src/sync.js

@@ -77,6 +77,7 @@ function init(url, token, sync, fs, callback) {
   }
 
   function handleClose(code, data) {
+    if(data) {
       try {
         data = JSON.parse(data);
       } catch(e) {
@@ -84,6 +85,9 @@ function init(url, token, sync, fs, callback) {
         sync.state = sync.SYNC_DISCONNECTED;
         return sync.emit('disconnected');
       }
+    } else {
+      data = 'Websocket unexpectedly closed.';
+    }
 
     socket.close();
     var error = new Error(code + ': ' + data);

server/lib/socket-server.js

@@ -38,7 +38,7 @@ module.exports = function( server ) {
       var sync = Sync.create( authData.username, authData.sessionId );
       sync.setSocket( ws );
 
-      ws.on('close', sync.onClose);
+      ws.on('close', sync.onClose());
 
       ws.on('message', function(data, flags) {
         if(!flags || (flags && !flags.binary)) {

server/lib/sync.js

@@ -76,6 +76,7 @@ function handleRequest(data) {
       that.init();
     } else {
       response = SyncMessage.error.locked;
+      response.content = { error: "Current sync in progress! Try again later!" };
     }
     that.socket.send(response.stringify());
   }