1 files changed, 16 insertions, 13 deletions

diff --git a/src/lib/socket.js b/src/lib/socket.js
index efc2651b..9d0c472e 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,8 +1,17 @@
-import { get } from "svelte/store";
-import { rate, user, token, ws } from '$lib/store';
+import { get } from 'svelte/store';
+import { rate, user, token } from '$lib/store';
 
 let interval, socket;
 
+export const auth = () => {
+	let t = get(token);
+	if (t) send('login', t);
+};
+
+export const send = (type, data) => {
+	socket?.readyState === 1 && socket.send(JSON.stringify({ type, data }));
+};
+
 export const messages = (data) => ({
 	rate() {
 		rate.set(data);
@@ -12,9 +21,7 @@ export const messages = (data) => ({
 		console.log(data);
 	},
 
-	connected() {
-		socket.send(JSON.stringify({ type: 'login', data: { token: get(token) } }));
-	},
+	connected: auth,
 
 	login() {
 		user.set(data);
@@ -29,18 +36,14 @@ let currentReconnectDelay = initialReconnectDelay;
 export function connect() {
 	clearInterval(interval);
 
-  if (socket) socket.close();
+	if (socket) return auth();
+
 	socket = new WebSocket('ws://localhost:3119/ws');
 	socket.addEventListener('open', onWebsocketOpen);
 	socket.addEventListener('close', onWebsocketClose);
 	socket.addEventListener('message', onWebsocketMessage);
 
-	interval = setInterval(
-		() => socket.readyState === 1 && socket.send(JSON.stringify({ type: 'heartbeat' })),
-		5000
-	);
-
-	ws.set(socket);
+	interval = setInterval(() => send('heartbeat'), 5000);
 }
 
 function onWebsocketMessage(msg) {
@@ -53,7 +56,7 @@ function onWebsocketOpen() {
 }
 
 function onWebsocketClose() {
-	ws.set(null);
+	socket = null;
 	setTimeout(() => {
 		reconnectToWebsocket();
 	}, currentReconnectDelay + Math.floor(Math.random() * 3000));