Merge pull request #40 from frontend-park-mail-ru/ws-fix

ws и sw fix
frontend-park-mail-ru · May 31, 2024 · df30e93 · df30e93
2 parents 0495ec1 + 5a42cf8
commit df30e93
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 32 deletions.
diff --git a/src/index.js b/src/index.js
@@ -18,15 +18,16 @@ function registerServiceWorker() {
         navigator.serviceWorker
             .getRegistrations()
             .then(function (registrations) {
-                if (registrations.length === 0) {
+                if (registrations.length < 2) {
                     return navigator.serviceWorker.register(
                         new URL('./serviceWorker.js', import.meta.url),
                     );
                 } else {
-                    const serviceWorker = registrations[0];
-                    if (!serviceWorker.active) {
-                        return serviceWorker.activate();
-                    }
+                    registrations.forEach((sw) => {
+                        if (!sw.active) {
+                            return sw.activate();
+                        }
+                    });
                 }
             })
             .catch(function (err) {

diff --git a/src/serviceWorker.js b/src/serviceWorker.js
@@ -30,18 +30,4 @@ self.addEventListener('fetch', (event) => {
     );
 });
 
-self.addEventListener('activate', (event) => {
-    const cacheWhitelist = [CACHE_NAME];
-
-    event.waitUntil(
-        caches.keys().then((cacheNames) => {
-            return Promise.all(
-                cacheNames.map((cacheName) => {
-                    if (cacheWhitelist.indexOf(cacheName) === -1) {
-                        return caches.delete(cacheName);
-                    }
-                }),
-            );
-        }),
-    );
-});
+self.addEventListener('activate', () => {});
diff --git a/src/utils/WebSocket.js b/src/utils/WebSocket.js
@@ -1,37 +1,47 @@
 import { baseUrl } from './API/config.js';
 
 export class WebSocketManager {
-    constructor(responsehandler) {
+    constructor(responseHandler) {
+        this.responseHandler = responseHandler;
+        this.createWebSocket();
+    }
+
+    createWebSocket() {
         if (baseUrl === 'chatme.site/api/v1') {
             this.socket = new WebSocket(`wss://${baseUrl}/ws/sendMessage`);
         } else {
             this.socket = new WebSocket(`ws://${baseUrl}/sendMessage`);
         }
-        this.responseHandler = responsehandler;
         this.connect();
     }
 
     connect() {
-        this.socket.onopen;
+        this.socket.onopen = () => {
+            console.log('WebSocket connection opened.');
+        };
+
         this.socket.onerror = (error) => {
             console.error('WebSocket error:', error);
         };
+
         // Добавляем прослушивание входящих сообщений
         this.socket.onmessage = (event) => {
             const data = JSON.parse(event.data);
             if (this.responseHandler) {
                 this.responseHandler(data);
             }
         };
-        this.socket.onclose = function (event) {
+
+        this.socket.onclose = (event) => {
             if (!event.wasClean) {
-                if (baseUrl === 'chatme.site/api/v1') {
-                    this.socket = new WebSocket(
-                        `wss://${baseUrl}/ws/sendMessage`,
-                    );
-                } else {
-                    this.socket = new WebSocket(`ws://${baseUrl}/sendMessage`);
-                }
+                console.warn(
+                    'WebSocket connection closed unexpectedly, reconnecting...',
+                );
+                setTimeout(() => {
+                    this.createWebSocket();
+                }, 3000);
+            } else {
+                console.log('WebSocket connection closed cleanly.');
             }
         };
     }
@@ -40,9 +50,10 @@ export class WebSocketManager {
         if (this.socket.readyState === WebSocket.OPEN) {
             this.socket.send(JSON.stringify(data));
         } else {
-            console.error('WebSocket error.');
+            console.error('WebSocket is not open.');
         }
     }
+
     close() {
         if (this.socket) {
             this.socket.close();