@symbo.ls/socket 2.11.131 → 2.11.162

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 symbo.ls
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/client.js

@@ -9,28 +9,28 @@ const { window } = globals.default || globals
 
 const ENV = process.env.NODE_ENV
 
-const SOCKET_BACKEND_URL = window && window.location &&
-  window.location.host.includes('local')
-  ? 'localhost:13335'
-  : 'socket.symbols.app' ||
-  'https://socket.symbols.app'
-
-let socket
-let tryConnect = 0
 const defautlOpts = {}
-const tryConnectMax = 1
 
 export const connect = (key, options = {}) => {
+  const isDev = options.development ||
+    (window && window.location && window.location.host.includes('local')) ||
+    (ENV === 'test' || ENV === 'development')
+
+  const SOCKET_BACKEND_URL = isDev
+    ? 'http://localhost:13336/'
+    : 'https://socket.symbols.app/'
+
   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)
+  const socket = io(primaryUrl || SOCKET_BACKEND_URL)
 
   socket.on('connect', () => {
-    if (ENV === 'test' || ENV === 'development') {
+    if (isDev) {
       console.log(
         `Connected to %c${primaryUrl || SOCKET_BACKEND_URL} %c${key} %c${socket.id}`,
         'font-weight: bold; color: green;',
@@ -39,7 +39,7 @@ export const connect = (key, options = {}) => {
       )
     }
 
-    socket.emit('initConnect', options)
+    socket.emit('initConnect', { key, ...options })
 
     try {
       if (isFunction(options.onConnect)) {
@@ -50,15 +50,18 @@ export const connect = (key, options = {}) => {
     }
   })
 
+  let CONNECT_ATTEPT = 0
+  const CONNECT_ATTEPT_MAX_ALLOWED = 1
+
   socket.on('connect_error', (err) => {
     console.log(`event: connect_error | reason: ${err.message}`)
     try {
       if (isFunction(options.onError)) options.onError(err, socket)
 
-      if (tryConnect < tryConnectMax) {
+      if (CONNECT_ATTEPT < CONNECT_ATTEPT_MAX_ALLOWED) {
         socket.disconnect()
 
-        tryConnect++
+        CONNECT_ATTEPT++
 
         if (ENV === 'test' || ENV === 'development') {
           console.log(
@@ -89,17 +92,21 @@ export const connect = (key, options = {}) => {
     if (event === 'connect') return
 
     try {
-      if (isFunction(options.onChange)) options.onChange(event, args[0], socket)
+      if (isFunction(options.onChange)) {
+        options.onChange(event, args[0], socket)
+      }
     } catch (e) {
       console.error(e)
     }
   })
+
+  return socket
 }
 
-export const send = (event = 'change', changes, options) => {
-  socket.emit(event, changes, { ...options, ...defautlOpts })
+export function send (event = 'change', changes, options) {
+  this.emit(event, changes, { ...options, ...defautlOpts })
 }
 
-export const disconnect = () => {
-  socket.disconnect()
+export function disconnect () {
+  this.disconnect()
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/socket",
-  "version": "2.11.131",
+  "version": "2.11.162",
   "description": "Connect your app to Symbols editor",
   "main": "server.js",
   "author": "symbo.ls",
@@ -11,11 +11,12 @@
   },
   "dependencies": {
     "@domql/utils": "latest",
+    "chalk": "^5.0.0",
     "express": "^4.18.1",
     "http": "^0.0.1-security",
     "merge-deep": "^3.0.3",
     "socket.io": "^4.5.2",
     "socket.io-client": "^4.5.2"
   },
-  "gitHead": "bb04754011c9d569b2486b9add6f8e45a33001e4"
+  "gitHead": "fe3359a1d6c14d38f45f5e5db10ef2056947a228"
 }

package/server.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 
 import fs from 'fs'
+import chalk from 'chalk'
 import express from 'express'
 import http from 'http'
 import { Server } from 'socket.io'
 import { createRequire } from 'module'
 import * as utils from '@domql/utils'
-const { overwriteDeep } = utils
+const { overwriteDeep } = utils.default
 
 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
@@ -14,20 +15,32 @@ const DES_SYS_DEFAULT_FILE = require('@symbo.ls/init/dynamic.json') // Bring in
 const app = express()
 let io
 
+const debugMsg = chalk.dim('Use --verbose to debug the error or open the issue at https://github.com/symbo-ls/smbls')
+
 export const updateDynamycFile = (changes, options = {}) => {
-  const { key, live } = options
+  const { verbose, prettify, verboseCode } = options
   const file = require('@symbo.ls/init/dynamic.json')
 
-  const newMerge = overwriteDeep(changes, file)
+  const newMerge = overwriteDeep(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) }
-    })
+  console.log(chalk.dim('\n----------------\n'))
+
+  console.log(chalk.dim('Received update:'))
+  console.log(Object.keys(changes).join(', '))
+  if (verboseCode) console.log(chalk.dim(JSON.stringify(changes, null, prettify ?? 2)))
+
+  try {
+    fs.writeFileSync(initPath, mergeStr)
+    if (verbose) {
+      console.log(chalk.bold.green('\nChanges wrote to the file'))
+    }
+  } catch (e) {
+    console.log('')
+    console.log(chalk.bold.red('Error writing file'))
+    if (verbose) console.error(e)
+    else console.log(debugMsg)
   }
 }
 
@@ -75,7 +88,7 @@ export const sync = (desSysFile = DES_SYS_DEFAULT_FILE, options = {}) => {
     })
   })
 
-  server.listen(13335, () => {
-    console.log('listening on *:13335')
+  server.listen(13336, () => {
+    console.log('listening on *:13336')
   })
 }