diff --git a/src/lib/userFunction.js b/src/lib/userFunction.js index 1fabbc3..eefa292 100644 --- a/src/lib/userFunction.js +++ b/src/lib/userFunction.js @@ -14,6 +14,7 @@ export async function UserCheck(){ else{ console.log(response) + location.assign('/login') } } diff --git a/src/lib/websocket.js b/src/lib/websocket.js index ced2fac..41d2a05 100644 --- a/src/lib/websocket.js +++ b/src/lib/websocket.js @@ -1,11 +1,10 @@ -export default function createWebSocket(url, token, onMessageCallback, maxRetries = 10) { +export default function createWebSocket(url, token, onMessageCallback) { let socket; let retries = 0; + const maxRetries = 5 let messageQueue = []; - token = token.split(" ")[1]; function connect() { - closeWebSocket(); socket = new WebSocket(url, [token]); @@ -16,6 +15,7 @@ export default function createWebSocket(url, token, onMessageCallback, maxRetrie socket.onopen = () => { console.log('WebSocket is open now.') + console.log(socket) retries = 0 //сброс попыток while (messageQueue.length > 0) { @@ -25,16 +25,6 @@ export default function createWebSocket(url, token, onMessageCallback, maxRetrie socket.onclose = (event) => { console.log('WebSocket is closed now.', event) - if (retries < maxRetries) { - retries++ - const timeout = Math.min(1000 * Math.pow(2, retries), 30000) - setTimeout(() => { - console.log(`Reconnecting... attempt ${retries}`) - connect() - }, timeout) - } else { - console.log('Max retries reached. Could not reconnect.') - } }; socket.onerror = (error) => { @@ -43,13 +33,6 @@ export default function createWebSocket(url, token, onMessageCallback, maxRetrie } - - function closeWebSocket() { - if (socket) { - socket.close(); - socket = null; - } - } connect() diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte deleted file mode 100644 index a6fe9df..0000000 --- a/src/routes/+page.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/src/routes/chat/+page.svelte b/src/routes/chat/+page.svelte index 5dd8a8a..0b199a9 100644 --- a/src/routes/chat/+page.svelte +++ b/src/routes/chat/+page.svelte @@ -83,10 +83,13 @@ const websocketUrl = `wss://docs.black-phoenix.ru/api/chat/ws/${chatId}` console.log(socket) - if (socket) + if (socket){ + console.log("Сокет есть") + socket.close(); socket = null - - socket = createWebSocket(websocketUrl, token, async (message) => { + } + let tokenForSocket = token.split(" ")[1]; + socket = createWebSocket(websocketUrl, tokenForSocket, async (message) => { console.log(message, "сообщение!!!!!") if(message.flag === "pin" ){ @@ -144,6 +147,8 @@ image = "https://images.black-phoenix.ru/static/images/images/%D0%B6%D0%BE%D0%BF%D0%B0%20%D1%81%D1%8A%D0%B5%D0%BB%D0%B0%20%D1%82%D1%80%D1%83%D1%81%D1%8B.jpg" } + if(socket.readyState === WebSocket.OPEN){ + socket.send(JSON.stringify({flag: flag, message: messageText, image_url: image, @@ -158,6 +163,12 @@ answerMessageImgShow = false answerMessage = "" answerMessageImg = "" + + } else { + + console.log("ноуп" ) + console.log(socket) + } } } @@ -201,15 +212,14 @@ let pickedId let PickedText = "" let PickedImg = "" let PickedName = "" -//$: console.log(pickedId) -//$: console.log(answer) let pinOrNot = false function helperDivShow(event, id, text, img, username) { - - pinOrNot = pinnedMsg.some(msg => msg.id == id) - console.log(pinOrNot) + if(pinnedMsg != null){ + pinOrNot = pinnedMsg.some(msg => msg.id == id) + console.log(pinOrNot) + } if (helperDiv) { helperDivBoolShow = false @@ -787,7 +797,6 @@ let pinOrNot = false flex-direction: column; height: 80%; width: 90%; - //background-color: red; } .newChatButtonDiv{ @@ -796,7 +805,6 @@ let pinOrNot = false justify-content: space-around; width: 100%; - //background-color: red; } .newChatName { @@ -869,7 +877,6 @@ let pinOrNot = false .pickedChatDiv{ display: flex; flex-direction: row; - //background-color: red; } .pickedChatImg{ @@ -1183,7 +1190,6 @@ let pinOrNot = false margin-top: -7px; width: 50px; height: 100%; - //background-color: red; } .messageImage{ diff --git a/src/routes/info/+page.svelte b/src/routes/info/+page.svelte deleted file mode 100644 index e69de29..0000000 diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index b20e1f0..251869b 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -111,7 +111,7 @@

Нет аккаунта? Лох!

-
@@ -120,21 +120,27 @@
-

не жопа

+
+

BP Chat

+ птичка +
{/if}