@ozdao/martyrs 0.2.469 → 0.2.471

package/src/modules/chats/routes/chats.routes.js

@@ -2,27 +2,39 @@
 const controllerFactory = require('../controllers/chats.controller.js');
 // Middlewares
 const middlewareFactory = require('@martyrs/src/modules/auth/controllers/middlewares');
-// Routes
+
 module.exports = function(app, db, wss) {
   const controller = controllerFactory(db);
-
   const { verifySignUp, verifyUser } = middlewareFactory(db);
 
+  // WebSocket-обработчик для модуля "chat"
   wss.registerModule('chat', async (ws, msg) => {
     if (msg.type === 'joinChat') {
-      ws.chatId = msg.chatId;
-    } else {
+      if (!msg.chatId) return;
+      // Вешаем chatId на сокет — позволяет фильтровать клиентов
+      if (!ws.activeChats) ws.activeChats = new Set();
+      ws.activeChats.add(msg.chatId);
+    }
+
+    if (msg.type === 'message') {
       const savedMessage = await controller.saveMessage(msg);
 
-      wss.broadcastToModuleWithFilter('chat', (client) =>
-        client.chatId === msg.chatId,
-        savedMessage
-      );
+      // Отправить сообщение всем в этом чате
+      wss.broadcastToModuleWithFilter('chat', (client) => {
+        return client.activeChats?.has(msg.chatId);
+      }, savedMessage);
     }
   });
 
+  // REST API: получить историю сообщений
+  app.get('/messages/:chatId', async (req, res) => {
+    const { chatId } = req.params;
+    const messages = await controller.getMessages(chatId);
+    res.json(messages);
+  });
 
-  app.use(function(req, res, next) {
+  // CORS-заголовки
+  app.use((req, res, next) => {
     res.header(
       "Access-Control-Allow-Headers",
       "Access-Control-Allow-Origin: *",
@@ -30,12 +42,4 @@ module.exports = function(app, db, wss) {
     );
     next();
   });
-
-  // REST API для получения истории сообщений
-  app.get('/messages/:chatId', async (req, res) => {
-    const { chatId } = req.params;
-    const messages = await controller.getMessages(chatId);
-    res.json(messages);
-  });
 };
-

package/src/modules/chats/store/chat.store.js

@@ -8,65 +8,92 @@ const state = reactive({
 });
 
 const methods = {
-  async connectWebSocket(user) {
-    // Use the global WebSocket instance
+  /**
+   * Подключение к глобальному WebSocket и подписка на чат
+   * @param {String} userId
+   */
+  async connectWebSocket(userId) {
     try {
-      console.log('connect', user);
-      await globalWebSocket.connect(user);
+      console.log('[Chat] Connecting to WebSocket with userId:', userId);
+      await globalWebSocket.connect(userId);
+      await globalWebSocket.subscribeModule('chat'); // 👈 Подписка на модуль чата
 
-      // Remove any existing 'message' listeners for the 'chat' module to avoid duplicates
+      // Очистка старых листенеров
       globalWebSocket.removeModuleListeners('chat');
 
-      // Register chat message event listener
-      const listenerId = globalWebSocket.addEventListener('message', (data) => {
+      // Добавляем обработчик входящих сообщений
+      globalWebSocket.addEventListener('message', (data) => {
         if (data.chatId === state.currentChatId) {
           state.messages.push(data);
         }
       }, { module: 'chat' });
 
-      return globalWebSocket;
     } catch (error) {
-      console.error('Failed to connect to WebSocket:', error);
+      console.error('[Chat] WebSocket connection failed:', error);
       throw error;
     }
   },
 
-  setMessages(messages) {
-    console.log(process.env.API_URL);
-    state.messages = messages;
-  },
-
-  async addMessage(message) {
-    await globalWebSocket.send(message);
-  },
-
+  /**
+   * Установка текущего активного чата и загрузка сообщений
+   * @param {String} chatId
+   */
   async setCurrentChat(chatId) {
     state.currentChatId = chatId;
-    state.messages = []; // Clear current messages when changing chat
+    state.messages = [];
 
-    // Send join chat message through the WebSocket
+    // Отправляем joinChat через WebSocket
     globalWebSocket.send({ type: 'joinChat', module: 'chat', chatId });
 
-    // Fetch chat history
-    const response = await fetch(`/messages/${chatId}`);
-    const messages = await response.json();
+    // Загружаем историю сообщений
+    try {
+      const response = await fetch(`/messages/${chatId}`);
+      const messages = await response.json();
+      methods.setMessages(messages);
+    } catch (err) {
+      console.error('[Chat] Failed to fetch messages:', err);
+    }
+  },
+
+  /**
+   * Установка сообщений
+   * @param {Array} messages
+   */
+  setMessages(messages) {
+    state.messages = messages;
+  },
 
-    methods.setMessages(messages);
+  /**
+   * Отправка сообщения через WebSocket
+   * @param {Object} message
+   */
+  async addMessage(message) {
+    await globalWebSocket.send({
+      ...message,
+      module: 'chat',
+      type: 'message',
+      chatId: state.currentChatId
+    });
   },
 
+  /**
+   * Установка имени пользователя
+   * @param {String} username
+   */
   setUsername(username) {
     state.username = username;
   },
 
+  /**
+   * Отключение от чата (очистка листенеров)
+   */
   disconnectChat() {
-    // Remove all chat-specific listeners when leaving chat page
     globalWebSocket.removeModuleListeners('chat');
-    // Optionally disconnect the WebSocket if no longer needed
-    // globalWebSocket.disconnect(); // Uncomment if you want to fully disconnect
+    // globalWebSocket.disconnect(); // включить, если нужно полностью разорвать соединение
   }
 };
 
 export default {
   state: readonly(state),
   methods
-};
+};

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -86,7 +86,7 @@
 			v-if="!firstImage?.content && firstVideo && firstVideo.content && type !== 'blogpostPage'"
 		>
 			<!-- <div class="flex-center flex"> -->
-	      <video controls class="mn-b-medium object-fit-cover w-100 h-max-20r">
+	      <video controls class="mn-b-medium object-fit-fit bg-black w-100 h-max-20r">
 	        <source :src="firstVideo.content" type="video/mp4">
 	        Your browser does not support the video tag.
 	      </video>

package/src/modules/community/components/pages/Blog.vue

@@ -23,7 +23,7 @@
       v-slot="{ 
         items 
       }"
-      class="row-1 gap-thin"
+      class="rows-1 gap-thin"
     >
       <CardBlogpost 
         v-for="item in items" 

package/src/modules/community/components/pages/BlogPost.vue

@@ -4,6 +4,7 @@
       <SkeletonBlogpost
         v-if="isLoading"
         v-for="i in 3" :key="i"
+        class=""
       />
     </TransitionGroup>
     <transition 

package/src/modules/community/components/pages/CreateBlogPost.vue

@@ -1,10 +1,10 @@
 <template>
   <article 
-    class="w-100 h-100 pos-relative"
+    class="w-100 bg-light radius-medium pos-relative"
   >
     <section  
       style="min-height: 100%;"
-      class="w-100 bg-white pd-big radius-medium"
+      class="w-100 pd-big"
     >
       <!-- Title -->
       <div 
@@ -29,7 +29,7 @@
     </section>
 
     <transition  name="scaleIn" >
-      <section v-if="post" class="pd-thin pos-sticky pos-l-0 pos-b-0 w-100 ">
+      <section v-if="post" class="pd-small pos-sticky pos-l-0 pos-b-0 w-100 ">
         <div class="pd-thin radius-big  bg-main w-100 flex-nowrap flex">
           <a v-if="route.params.url" @click="onDelete()" class="mn-r-auto bg-red t-white t-black button">Delete</a>
           <a @click="onDrafts()" class="mn-l-auto bg-white t-black button">To Drafts</a>

package/src/modules/constructor/components/elements/VideoPlayer.vue

@@ -1,6 +1,6 @@
 <template>
   <div 
-    class="mn-b-thin w-100 pd-medium bg-black radius-medium"
+    class="mn-b-thin w-100 o-hidden bg-black radius-medium"
   >
       
     <div v-if="prop.content" class="flex-center flex">

package/src/modules/constructor/components/sections/Constructor.vue

@@ -42,55 +42,55 @@
           >
             <button 
               @click="showMenu = !showMenu" 
-              class="mn-b-small cursor-pointer w-100 i-semi bg-light radius-thin"
+              class="mn-b-small cursor-pointer w-100 i-semi bg-white radius-thin"
             >
               {{ block.content ? '⋯' : '+' }}
             </button>
             
             <div 
               v-if="showMenu" 
-              class="z-index-5 radius-thin pd-thin bg-light w-max mn-b-small flex-nowrap flex-column flex"
+              class="z-index-5 radius-thin pd-thin bg-white w-max mn-b-small flex-nowrap flex-column flex"
             >
               <span 
                 v-if="index !== 0"
                 @click="handleDeleteBlock(block)" 
-                class="mn-b-thin w-max t-red bg-light button-small button"
+                class="mn-b-thin w-max t-red bg-white button-small button"
               >
                 Remove
               </span>
               <span 
                 @click="handleAddBlock('ImageUpload', '', index)" 
-                class="mn-b-thin w-max t-black bg-light button-small button"
+                class="mn-b-thin w-max t-black bg-white button-small button"
               >
                 Add Image
               </span>
               <span 
                 @click="handleAddBlock('H2', '', index)"
-                class="w-max button-small t-black bg-light button"
+                class="w-max button-small t-black bg-white button"
               >
                 Add Title
               </span>
               <span 
                 @click="handleAddBlock('Card', { photo: '', title: '', subtitle: '', }, index)"
-                class="w-max button-small t-black bg-light button"
+                class="w-max button-small t-black bg-white button"
               >
                 Add Card
               </span>
               <span 
                 @click="handleAddBlock('Embed', '', index)"
-                class="w-max button-small t-black bg-light button"
+                class="w-max button-small t-black bg-white button"
               >
                 Add Embed
               </span>
               <span 
                 @click="handleAddBlock('Audio', '', index)"
-                class="w-max button-small t-black bg-light button"
+                class="w-max button-small t-black bg-white button"
               >
                 Add Audio
               </span>
               <span 
                 @click="handleAddBlock('Video', '', index)"
-                class="w-max button-small t-black bg-light button"
+                class="w-max button-small t-black bg-white button"
               >
                 Add Video
               </span>

package/src/modules/events/components/pages/EditEvent.vue

@@ -71,7 +71,7 @@
       </div>
     </Block>
 
-		<section v-if="event" class="pd-b-extra w-100 bg-light pd-big radius-big">
+		<section v-if="event" class="pd-b-extra w-100 bg-light pd-big radius-medium">
       <Constructor 
         :content="event.content"
         @update="update => event.content = update"

package/src/modules/globals/controllers/classes/globals.crud.js

@@ -4,7 +4,7 @@ const Cache = require('@martyrs/src/modules/globals/controllers/classes/globals.
 const Logger = require('@martyrs/src/modules/globals/controllers/classes/globals.logger');
 
 class CRUD {
-  constructor(basePath, app, db, model) {
+  constructor(basePath, app, db, model, options) {
     this.model = model;
     this.cache = new Cache();
     this.logger = new Logger(db);
@@ -12,7 +12,7 @@ class CRUD {
     this.app = app;
     this.basePath = basePath;
 
-    this.registerRoutes();
+    if (!options || options && !options.disableDefaultRoutes) this.registerRoutes();
   }
 
   registerRoutes() {

package/src/modules/globals/controllers/classes/globals.websocket.js

@@ -8,12 +8,12 @@ class WebSocketManager {
       verifyClient: this.verifyClient.bind(this)
     });
 
-    this.modules = new Map(); // moduleName => handler
-    this.userConnections = new Map(); // userId => Set(ws)
+    this.modules = new Map();
+    this.userConnections = new Map();
 
     this.wss.on('connection', (ws, req) => {
-      ws.moduleName = null;
       ws.userId = req.userId || null;
+      ws.subscriptions = new Set();
 
       if (ws.userId) {
         this._trackUserConnection(ws.userId, ws);
@@ -22,14 +22,16 @@ class WebSocketManager {
       ws.on('message', async (rawMessage) => {
         try {
           const msg = JSON.parse(rawMessage);
-          console.log(msg)
-          const moduleName = ws.moduleName || msg.module;
 
-           console.log('module name is,', moduleName)
-             console.log('modules is,', this.modules)
+          // обработка подписки на модуль
+          if (msg.type === 'subscribe' && msg.module && this.modules.has(msg.module)) {
+            ws.subscriptions.add(msg.module);
+            return;
+          }
 
+          // нормальная маршрутизация
+          const moduleName = msg.module;
           if (moduleName && this.modules.has(moduleName)) {
-            ws.moduleName = moduleName;
             const handler = this.modules.get(moduleName);
             await handler(ws, msg);
           }
@@ -51,21 +53,16 @@ class WebSocketManager {
 
   verifyClient(info, done) {
     try {
-      const userCookie = info.req.headers.cookie
-        ?.split('; ')
-        .find((cookie) => cookie.startsWith('user='));
-
+      const userCookie = info.req.headers.cookie?.split('; ').find(c => c.startsWith('user='));
       if (!userCookie) return done(true);
 
       const token = JSON.parse(decodeURIComponent(userCookie.replace('user=', '')));
       const decoded = jwt.verify(token.accessToken, process.env.SECRET_KEY);
-
       info.req.userId = decoded._id;
     } catch (err) {
       console.error('Invalid token:', err);
     }
-
-    done(true); // Разрешаем в любом случае
+    done(true);
   }
 
   _trackUserConnection(userId, ws) {
@@ -80,30 +77,41 @@ class WebSocketManager {
   }
 
   sendToUserInModule(moduleName, userId, data) {
-    const sockets = this.userConnections.get(userId);
-    if (!sockets) return;
+    const userIdStr = userId.toString();
+
+    const sockets = this.userConnections.get(userIdStr);
 
+    if (!sockets) {
+      console.log(`No sockets found for user ${userIdStr}`);
+      return false;
+    }
+
+    let sent = false;
     for (const ws of sockets) {
-      if (ws.readyState === 1 && ws.moduleName === moduleName) {
+
+      if (ws.readyState === 1 && ws.subscriptions.has(moduleName)) {
         ws.send(JSON.stringify(data));
+        sent = true;
       }
     }
+    return sent;
   }
 
   broadcastToModule(moduleName, data) {
     for (const ws of this.wss.clients) {
-      if (ws.readyState === 1 && ws.moduleName === moduleName) {
+      if (ws.readyState === 1 && ws.subscriptions.has(moduleName)) {
         ws.send(JSON.stringify(data));
       }
     }
   }
 
   broadcastToModuleWithFilter(moduleName, filterFn, data) {
+     const sockets = this.userConnections
+
     for (const ws of this.wss.clients) {
       if (ws.readyState !== 1) continue;
-      if (ws.moduleName !== moduleName) continue;
+      if (!ws.subscriptions.has(moduleName)) continue;
       if (!filterFn(ws)) continue;
-
       ws.send(JSON.stringify(data));
     }
   }

package/src/modules/globals/globals.client.js

@@ -3,8 +3,6 @@
 
 import getBrowserLocale from './views/localization/get-browser-locale.js';
 import scrollBehavior from './views/router/scrollBehavior.js';
-import globalWebSocket from '@martyrs/src/modules/globals/views/classes/globals.websocket.js';
-
 
 import layoutApp from './views/components/layouts/App.vue'
 import layoutClient from './views/components/layouts/Client.vue'
@@ -70,16 +68,6 @@ function initializeGlobals(app, store, router, config, options = {}) {
     
   });
 
-    // Initialize global WebSocket
-  if (typeof window !== 'undefined') {
-    globalWebSocket.initialize({
-      wsUrl: process.env.WSS_URL || undefined,
-      maxReconnectAttempts: 5,
-      reconnectDelay: 3000,
-      pingInterval: 30000
-    });
-  }
-
 
   if (config && config.modules) storeGlobals.state.options = config.modules