wss fix

Author: maxchistt

client/src/Hooks/useUpdaterSocket.hook.js

@@ -4,8 +4,6 @@ import useWebSocket from 'react-use-websocket'
 import useDebouncedFunction from "./useDebouncedFunction.hook"
 import { useHttp } from "./http.hook"
 
-const WS_PORT = process.env.WS_PORT || 3030
-
 /**
  * Хук веб-сокета обновления данных
  * @param {void} updateData 
@@ -20,10 +18,9 @@ function useUpdaterSocket(updateData, auth) {
     /**колбек для получения url сокета */
     const getSocketUrl = useCallback(async () => {
         return new Promise(resolve => {
-            request("/getIp")
+            request("/getSocketAddress")
                 .then((data) => {
-                    const ip = data.ip
-                    const socketAddress = "ws://" + (ip || "localhost") + ":" + WS_PORT
+                    const socketAddress = data.socketAddress
                     console.log("socketAddress", socketAddress)
                     resolve(socketAddress)
                 })

server/app.js

@@ -22,9 +22,12 @@ const app = express()
 
 app.use(express.json({ extended: true }))
 
-app.get('/getIp', (req, res) => {
+app.get('/getSocketAddress', (req, res) => {
     getIp()
-        .then((ip) => res.status(200).json({ ip }))
+        .then((ip) => {
+            const socketAddress = (httpsRedirect ? "wss" : "ws") + "://" + (ip || "localhost") + ":" + WS_PORT
+            res.status(200).json({ socketAddress })
+        })
         .catch(() => res.status(500))
 })