@symbo.ls/socket 2.10.114 → 2.10.123

package/client.js

@@ -1,21 +1,27 @@
 'use strict'
 
-import { isFunction, isArray } from '@domql/utils'
+import * as utils from '@domql/utils'
+import * as globals from '@domql/globals'
 import io from 'socket.io-client'
 
+const { isFunction, isArray } = utils
+const { window } = globals
+
 const ENV = process.env.NODE_ENV
 
-const SOCKET_BACKEND_URL = window.location
-  .host.includes('local')
+const SOCKET_BACKEND_URL = window.location &&
+  window.location.host.includes('local')
   ? 'localhost:13335'
-  : 'https://socket.symbols.app'
+  : 'https://socket.symbols.app' ||
+  'https://socket.symbols.app'
 
 let socket
 const defautlOpts = {}
 
 export const connect = (key, options = {}) => {
-  const socketUrls = isArray(options.socketUrl) 
-    ? options.socketUrl : [options.socketUrl || SOCKET_BACKEND_URL]
+  const socketUrls = isArray(options.socketUrl)
+    ? options.socketUrl
+    : [options.socketUrl || SOCKET_BACKEND_URL]
   const primaryUrl = socketUrls[0]
   const secondaryUrl = socketUrls[1] || 'socket.symbols.app'
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/socket",
-  "version": "2.10.114",
+  "version": "2.10.123",
   "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": "12592b1165c6671cc7cdbad50a0448072b3fff3d"
+  "gitHead": "8e7c8dada6686b012c70e414cada2dd249790ab2"
 }

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/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 (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

package/README.md

@@ -1,11 +0,0 @@
-# Socket
-
-Yarn:
-```
-yarn add smbls
-```
-
-or via NPM:
-```
-npx smbls socket
-```

package/__client.js

@@ -1,98 +0,0 @@
-'use strict'
-
-import { window } from '@domql/globals'
-import { isFunction, isArray } from '@domql/utils'
-// import { } from 'socket.io-client/build/esm/index.js'
-
-const ENV = process.env.NODE_ENV
-
-const SOCKET_BACKEND_URL = window.location
-  ?.host.includes('local')
-  ? 'localhost:13335'
-  : 'socket.symbols.app'
-
-let socket
-const defautlOpts = {}
-
-export const connect = (key, options = {}) => {
-  const socketUrls = isArray(options.socketUrl) ? options.socketUrl : [options.socketUrl || SOCKET_BACKEND_URL]
-  const primaryUrl = socketUrls[0]
-  const secondaryUrl = socketUrls[1] || 'socket.symbols.app'
-
-  socket = io(primaryUrl || SOCKET_BACKEND_URL)
-
-  socket.on('connect', () => {
-    if (ENV === 'test' || ENV === 'development') {
-      console.log(
-        `Connected to %c${primaryUrl || SOCKET_BACKEND_URL} %c${key} %c${socket.id}`,
-        'font-weight: bold; color: green;',
-        'font-weight: bold;',
-        ''
-      )
-    }
-
-    socket.emit('initConnect', options)
-
-    try {
-      if (isFunction(options.onConnect)) options.onConnect(socket.id, socket)
-    } catch (e) {
-      console.error(e)
-    }
-  })
-
-  let tryConnect = 0
-  const tryConnectMax = 1
-  socket.on('connect_error', (err) => {
-    console.log(err)
-    console.log(`event: connect_error | reason: ${err.message}`)
-    try {
-      if (isFunction(options.onError)) options.onError(err, socket)
-      if (tryConnect === tryConnectMax) {
-        socket.disconnect()
-
-        if (primaryUrl !== secondaryUrl) {
-          if (ENV === 'test' || ENV === 'development') {
-            console.log(
-              'Could not connect to %c' + primaryUrl + '%c, reconnecting to %c' + secondaryUrl,
-              'font-weight: bold; color: red;',
-              '',
-              'font-weight: bold; color: green;'
-            )
-          }
-
-          connect(key, { ...options, socketUrl: secondaryUrl })
-        }
-      }
-    } catch (e) {
-      console.error(e)
-    }
-    tryConnect++
-  })
-
-  socket.on('disconnect', (reason) => {
-    console.log(`event: disconnect | reason: ${reason}`)
-    try {
-      if (isFunction(options.onDisconnect)) options.onDisconnect(reason, socket)
-    } catch (e) {
-      console.error(e)
-    }
-  })
-
-  socket.onAny((event, ...args) => {
-    if (event === 'connect') return
-
-    try {
-      if (isFunction(options.onChange)) options.onChange(event, args[0], socket)
-    } catch (e) {
-      console.error(e)
-    }
-  })
-}
-
-export const send = (event = 'change', changes, options) => {
-  socket.emit(event, changes, { ...options, ...defautlOpts })
-}
-
-export const disconnect = () => {
-  socket.disconnect()
-}