socket fixup

Author: maxchistt

client/src/Hooks/useUpdaterSocket.hook.js

@@ -26,18 +26,19 @@ function useUpdaterSocket(updateData, auth) {
         })
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [])
+
     const debouncedUpdate = useDebouncedFunction(updateData, 200)
 
     const socketOptions = {
         onOpen: (e) => {
             sendRegisterMsg()
-            console.log("ws open", e)
+            console.log("ws open")
         },
         onClose: (e) => {
-            console.log("ws close", e)
+            console.log("ws close")
         },
         onMessage: (e) => {
-            console.log("ws updMessage", e)
+            console.log("ws update message")
             debouncedUpdate()
         },
         onError: (e) => {
@@ -55,6 +56,8 @@ function useUpdaterSocket(updateData, auth) {
         sendMessage(msg)
     }
 
+    const sendUpdateMsgDebounced = useDebouncedFunction(sendUpdateMsg, 200)
+
     function sendUpdateMsg() {
         sendMsg("update")
     }
@@ -63,7 +66,7 @@ function useUpdaterSocket(updateData, auth) {
         sendMsg("register")
     }
 
-    return [sendUpdateMsg]
+    return [sendUpdateMsgDebounced]
 }
 
 export default useUpdaterSocket

server/app.js

@@ -23,8 +23,9 @@ const app = express()
 app.use(express.json({ extended: true }))
 
 app.get('/getIp', (req, res) => {
-    const ip = getIp()
-    res.status(200).json({ ip })
+    getIp()
+        .then((ip) => res.status(200).json({ ip }))
+        .catch(() => res.status(500))
 })
 
 /**
@@ -86,19 +87,22 @@ async function connectMongo(mongoUri) {
 /**
  * Вывод информации о сервере
  */
-function logServerStart() {
+async function logServerStart() {
     const [logName, sBef, sAft] = devMode ? ['Express server', ' ', ':'] : ['React Notes App', '-', '']
+    const ip = await getIp()
     console.log(`\n${logName} has been started`)
     console.log(`${sBef} Local${sAft}            http://localhost:${PORT}`)
-    console.log(`${sBef} On Your Network${sAft}  http://${getIp()}:${PORT}`, '\n')
+    console.log(`${sBef} On Your Network${sAft}  http://${ip}:${PORT}\n`)
 }
 
 /**
  * Получение ip сервера
  */
 function getIp() {
-    for (let key in os.networkInterfaces()) {
-        const addr = os.networkInterfaces()[key][1].address
-        if (addr != undefined) return addr
-    }
+    return new Promise((res, rej) => {
+        require('dns').lookup(os.hostname(), (err, addr) => {
+            addr ? res(addr) : rej()
+            err && console.log(err)
+        })
+    })
 }

server/socket/wss.js

@@ -8,9 +8,10 @@ const WebSocket = require('ws')
 function startWSS(port) {
     let wsCount = 0
     const wsServer = new WebSocket.Server({ port })
-    const wsCollection = { test: [] }
+    const wsCollection = {}
     wsServer.on('connection', (wsClient) => {
         wsClient.num = ++wsCount
+
         wsClient.on("message", (data) => {
             try {
                 const { userId, target } = tryParce(data)
@@ -20,35 +21,28 @@ function startWSS(port) {
                     let clients = getClients(userId)
                     clients.push({
                         num: wsClient.num,
-                        send: wsClient.send
+                        send: msg => wsClient.send(msg)
                     })
                     wsCollection[userId] = clients
-
-                    console.log("\ncollection \n", wsCollection, '\n')
                 }
 
                 if (target == "update") {
                     getClients(wsClient.userId).forEach((wsc) => {
-                        if ((wsClient.num === undefined) || (wsClient.num !== wsc.num)) wsc.send(data)
+                        if ((wsClient.num === undefined) || (wsClient.num !== wsc.num)) {
+                            wsc.send(data)
+                        }
                     })
                 }
 
-                console.log("wsClient", wsClient.num, "messaged", target)
-            } catch (e) {
-                console.log("wsClient", wsClient.num, "error on messsage", e)
-            }
+            } catch (e) { }
         })
-        wsClient.on("open", () => console.log("wsClient", wsClient.num, "opened"))
+
         wsClient.on("close", () => {
             wsCollection[wsClient.userId] = getClients(wsClient.userId).filter((wsc) => {
                 return (wsClient.num === undefined) || (wsClient.num !== wsc.num)
             })
-            console.log("wsClient", wsClient.num, "closed")
         })
-        wsClient.on("error", () => console.log("wsClient", wsClient.num, "error"))
-
-        console.log("WSS connection", wsClient.num)
-    });
+    })
     wsServer.on("close", () => console.log("WSS closed"))
     wsServer.on("error", () => console.log("WSS error"))
     wsServer.on("listening", () => console.log("WSS listening"))