@symbo.ls/socket 2.6.6 → 2.6.8

package/client.js

@@ -1,29 +1,34 @@
 'use strict'
 
-import { isFunction } from '@domql/utils'
+import { isFunction, isArray } from '@domql/utils'
 import io from 'socket.io-client'
 
-// 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 ENV = process.env.NODE_ENV
 
 const SOCKET_BACKEND_URL = window.location
-  .host.includes('localhost')
-  ? 'ws://localhost:13335'
-  : 'https://socket.symbols.app'
+  .host.includes('local')
+  ? 'localhost:13335'
+  : 'socket.symbols.app'
 
 let socket
 const defautlOpts = {}
 
 export const connect = (key, options = {}) => {
-  socket = io(options.socketUrl || SOCKET_BACKEND_URL, {
-    withCredentials: true
-  })
+  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', () => {
-    console.log('Connected to', options.socketUrl || SOCKET_BACKEND_URL, key, socket.id)
+    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)
 
@@ -34,13 +39,29 @@ export const connect = (key, options = {}) => {
     }
   })
 
+  let tryConnect = 0
   socket.on('connect_error', (err) => {
     console.log(`event: connect_error | reason: ${err.message}`)
     try {
       if (isFunction(options.onError)) options.onError(err, socket)
+      if (tryConnect === 2) {
+        socket.disconnect()
+
+        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) => {
@@ -67,6 +88,6 @@ export const send = (event = 'change', changes, options) => {
   socket.emit(event, changes, { ...options, ...defautlOpts })
 }
 
-export const disconnect = changes => {
-  socket.emit('disconnect')
+export const disconnect = () => {
+  socket.disconnect()
 }

package/package.json

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