@symbo.ls/socket 0.0.15 → 0.0.17

package/client.js

@@ -15,12 +15,16 @@ const SOCKET_BACKEND_URL = window.location
   : 'ws://socket.symbols.app'
 
 let socket
+const defautlOpts = {}
 
 export const connect = (key, options = {}) => {
   socket = io(SOCKET_BACKEND_URL)
 
   socket.on('connect', () => {
-    console.log('Connected to', options.url || SOCKET_BACKEND_URL, key, socket.id)
+    console.log('Connected to', options.socketUrl || SOCKET_BACKEND_URL, key, socket.id)
+
+    socket.emit('initConnect', options)
+
     try {
       if (isFunction(options.onConnect)) options.onConnect(socket.id, socket)
     } catch (e) {
@@ -47,6 +51,8 @@ export const connect = (key, options = {}) => {
   })
 
   socket.onAny((event, ...args) => {
+    if (event === 'connect') return
+
     try {
       if (isFunction(options.onChange)) options.onChange(event, args[0], socket)
     } catch (e) {
@@ -55,8 +61,8 @@ export const connect = (key, options = {}) => {
   })
 }
 
-export const send = (changes, options) => {
-  socket.emit('change', changes, options)
+export const send = (event = 'change', changes, options) => {
+  socket.emit(event, changes, { ...options, ...defautlOpts })
 }
 
 export const disconnect = changes => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/socket",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Connect your app to Symbols editor",
   "main": "server.js",
   "author": "symbo.ls",

package/server.js

@@ -16,7 +16,7 @@ const app = express()
 
 export const sync = (desSysFile = DES_SYS_DEFAULT_FILE, options = {}) => {
   const server = http.createServer(app)
-  console.log(options)
+  const { key, live } = options
 
   const io = new Server(server, {
     transports: ['websocket', 'polling', 'flashsocket'],
@@ -30,26 +30,39 @@ export const sync = (desSysFile = DES_SYS_DEFAULT_FILE, options = {}) => {
   })
 
   io.on('connection', (socket) => {
-    console.log('Connected', options.key)
     const { clientsCount } = io.engine
 
-    socket.join(options.key)
+    socket.join(key)
 
-    socket.to(options.key).emit('init', desSysFile)
-    socket.to(options.key).emit('clientsCount', clientsCount)
+    // socket.to(key).emit('init', desSysFile)
 
-    socket.on('change', changes => {
+    let source
+    socket.on('initConnect', (options) => {
+      source = options.source
+      console.log('Connected', key, source)
+      socket.to(key).emit('clientsCount', clientsCount)
+    })
+
+    socket.on('components', (data, options) => {
+      io.to(key).emit('change', data, options)
+    })
+
+    socket.on('route', (data, options) => {
+      io.to(key).emit('route', data, options)
+    })
+
+    socket.on('change', (changes, options) => {
       const file = require('@symbo.ls/init/src/dynamic.json')
       const newMerge = mergeDeep(file, changes)
       const mergeStr = JSON.stringify(newMerge, null, 2)
       const initPath = process.cwd() + '/node_modules/@symbo.ls/init/src/dynamic.json'
 
-      if (!options.live) {
+      if (live) {
+        io.to(key).emit('liveChange', mergeStr)
+      } else {
         fs.writeFile(initPath, mergeStr, function (err) {
           if (err) { return console.log(err) }
         })
-      } else {
-        io.to(options.key).emit('liveChange', mergeStr)
       }
     })
   })