Prepare for single websocket connection

src/connection.coffee

@@ -5,8 +5,8 @@ module.exports =
 class Connection
   constructor: (@nsync) ->
 
-  connect: (@url, @opts) ->
-    @socket = new AtomSocket('fs', @url)
+  connect: (@url, @socketKey) ->
+    @socket = new AtomSocket(@socketKey, @url)
 
     @socket.on 'open', =>
       @nsync.connected()
@@ -25,7 +25,8 @@ class Connection
       @nsync.init()
 
   send: (msg) ->
-    @socket.send(msg)
+    preparedMessage = JSON.stringify(file_sync: msg)
+    @socket.send(preparedMessage)
 
   reset: ->
     @socket.reset()

src/nsync-fs.coffee

@@ -18,8 +18,8 @@ class Nsync
   configure: ({@expansionState, @localRoot, connection}) ->
     @setLocalPaths()
 
-    {websocket, url, opts} = connection
-    @connection.connect(url, opts, websocket)
+    {url, socketKey} = connection
+    @connection.connect(url, socketKey)
 
     @emitter.emit('did-configure')
 
@@ -119,7 +119,7 @@ class Nsync
     if @isConnected is false
       @disconnectedSend(convertedMsg)
 
-    @connection.send(JSON.stringify(convertedMsg))
+    @connection.send(convertedMsg)
 
   # ------------------
   # File introspection

src/onmessage.coffee

@@ -19,13 +19,16 @@ messageStrategies = {
 }
 
 module.exports = onmessage = (message, nsync) ->
-
   try
-    {type, data} = JSON.parse(message)
-    console.log 'nsync:received', {type}
+    {file_sync} = JSON.parse(message)
   catch error
     return console.error 'nsync:received:parse', {error}
 
+  if not file_sync?
+    return
+
+  {type, data} = file_sync
+  console.log 'nsync:received', {type}
   strategy = messageStrategies[type]
 
   if not strategy?