@symbo.ls/socket 0.0.13 → 0.0.15

package/client.js

@@ -1,32 +1,54 @@
 'use strict'
 
+import { isFunction } from '@domql/utils'
 import io from 'socket.io-client'
 
-// const url = 'ws://localhost:1001'
-// const url = 'ws://52.14.150.69:8080'
-// const url = 'ws://ec2-52-14-150-69.us-east-2.compute.amazonaws.com:8080'
-// const url = 'ws://socket.symbols.app'
-const url = 'ws://52.14.150.69:8080'
+// const SOCKET_BACKEND_URL = 'ws://localhost:1001'
+// const SOCKET_BACKEND_URL = 'ws://52.14.150.69:8080'
+// const SOCKET_BACKEND_URL = 'ws://ec2-52-14-150-69.us-east-2.compute.amazonaws.com:8080'
+// const SOCKET_BACKEND_URL = 'ws://ec2-52-14-150-69.us-east-2.compute.amazonaws.com:8080'
+// const SOCKET_BACKEND_URL = 'ws://52.14.150.69:8080'
+
+const SOCKET_BACKEND_URL = window.location
+  .host.includes('localhost')
+  ? 'ws://localhost:13335'
+  : 'ws://socket.symbols.app'
+
 let socket
 
-export const connect = (key, receive) => {
-  socket = io(url)
+export const connect = (key, options = {}) => {
+  socket = io(SOCKET_BACKEND_URL)
 
   socket.on('connect', () => {
-    console.log(`event: connect | session id: ${socket.id}`)
+    console.log('Connected to', options.url || SOCKET_BACKEND_URL, key, socket.id)
+    try {
+      if (isFunction(options.onConnect)) options.onConnect(socket.id, socket)
+    } catch (e) {
+      console.error(e)
+    }
   })
 
   socket.on('connect_error', (err) => {
     console.log(`event: connect_error | reason: ${err.message}`)
+    try {
+      if (isFunction(options.onError)) options.onError(err, socket)
+    } catch (e) {
+      console.error(e)
+    }
   })
 
   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) => {
     try {
-      receive(event, args[0])
+      if (isFunction(options.onChange)) options.onChange(event, args[0], socket)
     } catch (e) {
       console.error(e)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/socket",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Connect your app to Symbols editor",
   "main": "server.js",
   "author": "symbo.ls",
@@ -14,6 +14,7 @@
     "express": "^4.18.1",
     "http": "^0.0.1-security",
     "merge-deep": "^3.0.3",
+    "@domql/utils": "^4.5.2",
     "socket.io": "^4.5.2",
     "socket.io-client": "^4.5.2"
   },

package/server.js

@@ -31,10 +31,12 @@ 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.to(options.key).emit('init', desSysFile)
+    socket.to(options.key).emit('clientsCount', clientsCount)
 
     socket.on('change', changes => {
       const file = require('@symbo.ls/init/src/dynamic.json')
@@ -47,12 +49,12 @@ export const sync = (desSysFile = DES_SYS_DEFAULT_FILE, options = {}) => {
           if (err) { return console.log(err) }
         })
       } else {
-        io.to(options.key).emit('live-change', mergeStr)
+        io.to(options.key).emit('liveChange', mergeStr)
       }
     })
   })
 
-  server.listen(1001, () => {
-    console.log('listening on *:1001')
+  server.listen(13335, () => {
+    console.log('listening on *:13335')
   })
 }