@symbo.ls/socket 0.0.8 → 0.0.9

package/client.js

@@ -2,10 +2,16 @@
 
 import io from 'socket.io-client'
 
+const url = 'ws://localhost:1001'
 let socket
+let appKkey
 
-export const connect = (url, receive) => {
+export const connect = (key, receive) => {
   socket = io(url)
+  appKkey = key
+
+  // console.log(socket)
+  // socket.join(key)
 
   socket.on('connect', () => {
     console.log(`event: connect | session id: ${socket.id}`)
@@ -20,6 +26,7 @@ export const connect = (url, receive) => {
   })
 
   socket.onAny((event, ...args) => {
+    console.log(event, args[0])
     if (event === 'init') receive(event, args[0])
     else {
       try {
@@ -31,8 +38,8 @@ export const connect = (url, receive) => {
   })
 }
 
-export const send = changes => {
-  socket.emit('change', changes)
+export const send = (changes, options) => {
+  socket.emit('change', changes, options)
 }
 
 export const disconnect = changes => {

package/package.json

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

package/server.js

@@ -5,7 +5,7 @@ import express from 'express'
 import http from 'http'
 import { Server } from 'socket.io'
 import { dirname } from 'path' // eslint-disable-line
-import merge from 'merge-deep' // use the require method
+import mergeDeep from 'merge-deep' // use the require method
 
 import { createRequire } from 'module'
 
@@ -14,8 +14,9 @@ const DYNAMIC_CONFIG = require('@symbo.ls/init/src/dynamic.json') // Bring in th
 
 const app = express()
 
-export const sync = (symbolsInitFile = DYNAMIC_CONFIG) => {
+export const sync = (symbolsInitFile = DYNAMIC_CONFIG, options = {}) => {
   const server = http.createServer(app)
+  console.log(options)
 
   const io = new Server(server, {
     transports: ['websocket', 'polling', 'flashsocket'],
@@ -29,17 +30,25 @@ export const sync = (symbolsInitFile = DYNAMIC_CONFIG) => {
   })
 
   io.on('connection', (socket) => {
-    console.log('a user connected')
+    console.log('Connected', options.key)
 
-    socket.emit('init', symbolsInitFile)
+    socket.join(options.key)
 
-    socket.on('change', change => {
-      const newMerge = merge(change, symbolsInitFile)
+    socket.to(options.key).emit('init', symbolsInitFile)
+
+    socket.on('change', changes => {
+      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'
-      fs.writeFile(initPath, mergeStr, function (err) {
-        if (err) { return console.log(err) }
-      })
+
+      if (!options.live) {
+        fs.writeFile(initPath, mergeStr, function (err) {
+          if (err) { return console.log(err) }
+        })
+      } else {
+        io.to(options.key).emit('live-change', mergeStr)
+      }
     })
   })