@symbo.ls/socket 2.10.121 → 2.10.134

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/socket",
-  "version": "2.10.121",
+  "version": "2.10.134",
   "description": "Connect your app to Symbols editor",
   "main": "server.js",
   "author": "symbo.ls",
@@ -17,5 +17,5 @@
     "socket.io": "^4.5.2",
     "socket.io-client": "^4.5.2"
   },
-  "gitHead": "056cc9dcdadcc2022ec2b400eb1a8a3909d42380"
+  "gitHead": "ca88f67b0c989938a8118a539f75608bcbacc26a"
 }

package/server.js

@@ -4,16 +4,31 @@ import fs from 'fs'
 import express from 'express'
 import http from 'http'
 import { Server } from 'socket.io'
-import { dirname } from 'path' // eslint-disable-line
-import mergeDeep from 'merge-deep' // use the require method
-
 import { createRequire } from 'module'
+import { deepMerge, overwriteDeep } from '@domql/utils'
 
 const require = createRequire(import.meta.url) // construct the require method
 const DES_SYS_DEFAULT_FILE = require('@symbo.ls/init/dynamic.json') // Bring in the ability to create the 'require' method
 
 const app = express()
 
+export const updateDynamycFile = (changes, options = {}) => {
+  const { key, live } = options
+  const file = require('@symbo.ls/init/dynamic.json')
+  
+  const newMerge = overwriteDeep(changes, file)
+  const mergeStr = JSON.stringify(newMerge, null, 2)
+  const initPath = process.cwd() + '/node_modules/@symbo.ls/init/dynamic.json'
+
+  if (live) {
+    io.to(key).emit('liveChange', mergeStr)
+  } else {
+    fs.writeFile(initPath, mergeStr, function (err) {
+      if (err) { return console.log(err) }
+    })
+  }
+}
+
 export const sync = (desSysFile = DES_SYS_DEFAULT_FILE, options = {}) => {
   const server = http.createServer(app)
   const { key, live } = options
@@ -49,20 +64,7 @@ export const sync = (desSysFile = DES_SYS_DEFAULT_FILE, options = {}) => {
       io.to(key).emit('route', data, options)
     })
 
-    socket.on('change', (changes, options) => {
-      const file = require('@symbo.ls/init/dynamic.json')
-      const newMerge = mergeDeep(file, changes)
-      const mergeStr = JSON.stringify(newMerge, null, 2)
-      const initPath = process.cwd() + '/node_modules/@symbo.ls/init/dynamic.json'
-
-      if (live) {
-        io.to(key).emit('liveChange', mergeStr)
-      } else {
-        fs.writeFile(initPath, mergeStr, function (err) {
-          if (err) { return console.log(err) }
-        })
-      }
-    })
+    socket.on('change', updateDynamycFile)
 
     socket.on('disconnect', (changes, options) => {
       const { clientsCount } = io.engine