@ozdao/martyrs 0.2.468 → 0.2.470

package/dist/{Media-DwVcRIAX.mjs → Media-C4Ges_Sd.mjs}

@@ -1,5 +1,5 @@
 import { ref as u, computed as m, onMounted as N, onUnmounted as P, createElementBlock as c, openBlock as d, createCommentVNode as f, mergeProps as V, createElementVNode as S, toDisplayString as q } from "vue";
-import { _ as z } from "./main-DEHjtgLs.mjs";
+import { _ as z } from "./main-CTcal9qN.mjs";
 const D = { class: "media-container" }, T = ["src", "data-src", "alt"], U = ["controls", "loop", "muted", "autoplay", "playsinline", "preload"], _ = ["src", "type"], $ = {
   key: 2,
   class: "media-placeholder"

package/dist/{Media-DCGbUujy.js → Media-CR0V1zvB.js}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),V=require("./main-UVdexuMN.js"),C={class:"media-container"},M=["src","data-src","alt"],j=["controls","loop","muted","autoplay","playsinline","preload"],N=["src","type"],O={key:2,class:"media-placeholder"},P={key:3,class:"media-error"},S={__name:"Media",props:{url:{type:String,required:!0},options:{type:Object,default:()=>({muted:!0,loop:!0,playsinline:!0,preload:"metadata"})}},setup(t){const m=t,l=e.ref(null),p=e.ref(null),s=e.ref(!1),u=e.ref(null),v=e.ref(!1);let i=null,f=!1;const d=e.computed(()=>{var o,a,n;return(n=(a=(o=m.url)==null?void 0:o.split("."))==null?void 0:a.pop())==null?void 0:n.toLowerCase()}),g=e.computed(()=>["jpg","jpeg","png","gif","webp","svg","avif"].includes(d.value)),y=e.computed(()=>["mp4","webm","ogg"].includes(d.value)),x=e.computed(()=>({mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg"})[d.value]||"");function E(){s.value=!0}function I(o){u.value=`Ошибка загрузки медиа: ${o.message}`,s.value=!1}async function w(){if(l.value)try{l.value.paused&&!f&&(await l.value.play(),f=!0)}catch(o){I(o)}}function L(){const o={root:null,rootMargin:"50px",threshold:.1};i=new IntersectionObserver(n=>{n.forEach(r=>{var c;v.value=r.isIntersecting,r.isIntersecting&&(y.value&&((c=m.options)!=null&&c.autoplay)&&w(),i.disconnect())})},o);const a=g.value?p.value:l.value;a&&i.observe(a)}return e.onMounted(()=>{L()}),e.onUnmounted(()=>{i&&i.disconnect()}),(o,a)=>{var n,r,c,k,h,b,B;return e.openBlock(),e.createElementBlock("div",C,[g.value?(e.openBlock(),e.createElementBlock("img",e.mergeProps({key:0,src:v.value?t.url:"","data-src":t.url,alt:((n=t.options)==null?void 0:n.alt)||"Image",class:["media-item",{loading:!s.value}],loading:"lazy",onLoad:E},t.options,{ref_key:"imageElement",ref:p}),null,16,M)):y.value?(e.openBlock(),e.createElementBlock("video",e.mergeProps({key:1,ref_key:"videoElement",ref:l,class:[{loading:!s.value},"media-item"],controls:!((r=t.options)!=null&&r.hideControls),loop:((c=t.options)==null?void 0:c.loop)!==!1,muted:((k=t.options)==null?void 0:k.muted)!==!1,autoplay:(h=t.options)==null?void 0:h.autoplay,playsinline:((b=t.options)==null?void 0:b.playsinline)!==!1,preload:((B=t.options)==null?void 0:B.preload)||"metadata",onLoadeddata:E},t.options),[e.createElementVNode("source",{src:t.url,type:x.value},null,8,N)],16,j)):e.createCommentVNode("",!0),s.value?e.createCommentVNode("",!0):(e.openBlock(),e.createElementBlock("div",O," Loading... ")),u.value?(e.openBlock(),e.createElementBlock("div",P,e.toDisplayString(u.value),1)):e.createCommentVNode("",!0)])}}},q=V._export_sfc(S,[["__scopeId","data-v-1f94a0e9"]]);exports.default=q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),V=require("./main-CsZAG5Wz.js"),C={class:"media-container"},M=["src","data-src","alt"],j=["controls","loop","muted","autoplay","playsinline","preload"],N=["src","type"],O={key:2,class:"media-placeholder"},P={key:3,class:"media-error"},S={__name:"Media",props:{url:{type:String,required:!0},options:{type:Object,default:()=>({muted:!0,loop:!0,playsinline:!0,preload:"metadata"})}},setup(t){const m=t,l=e.ref(null),p=e.ref(null),s=e.ref(!1),u=e.ref(null),v=e.ref(!1);let i=null,f=!1;const d=e.computed(()=>{var o,a,n;return(n=(a=(o=m.url)==null?void 0:o.split("."))==null?void 0:a.pop())==null?void 0:n.toLowerCase()}),g=e.computed(()=>["jpg","jpeg","png","gif","webp","svg","avif"].includes(d.value)),y=e.computed(()=>["mp4","webm","ogg"].includes(d.value)),x=e.computed(()=>({mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg"})[d.value]||"");function E(){s.value=!0}function I(o){u.value=`Ошибка загрузки медиа: ${o.message}`,s.value=!1}async function w(){if(l.value)try{l.value.paused&&!f&&(await l.value.play(),f=!0)}catch(o){I(o)}}function L(){const o={root:null,rootMargin:"50px",threshold:.1};i=new IntersectionObserver(n=>{n.forEach(r=>{var c;v.value=r.isIntersecting,r.isIntersecting&&(y.value&&((c=m.options)!=null&&c.autoplay)&&w(),i.disconnect())})},o);const a=g.value?p.value:l.value;a&&i.observe(a)}return e.onMounted(()=>{L()}),e.onUnmounted(()=>{i&&i.disconnect()}),(o,a)=>{var n,r,c,k,h,b,B;return e.openBlock(),e.createElementBlock("div",C,[g.value?(e.openBlock(),e.createElementBlock("img",e.mergeProps({key:0,src:v.value?t.url:"","data-src":t.url,alt:((n=t.options)==null?void 0:n.alt)||"Image",class:["media-item",{loading:!s.value}],loading:"lazy",onLoad:E},t.options,{ref_key:"imageElement",ref:p}),null,16,M)):y.value?(e.openBlock(),e.createElementBlock("video",e.mergeProps({key:1,ref_key:"videoElement",ref:l,class:[{loading:!s.value},"media-item"],controls:!((r=t.options)!=null&&r.hideControls),loop:((c=t.options)==null?void 0:c.loop)!==!1,muted:((k=t.options)==null?void 0:k.muted)!==!1,autoplay:(h=t.options)==null?void 0:h.autoplay,playsinline:((b=t.options)==null?void 0:b.playsinline)!==!1,preload:((B=t.options)==null?void 0:B.preload)||"metadata",onLoadeddata:E},t.options),[e.createElementVNode("source",{src:t.url,type:x.value},null,8,N)],16,j)):e.createCommentVNode("",!0),s.value?e.createCommentVNode("",!0):(e.openBlock(),e.createElementBlock("div",O," Loading... ")),u.value?(e.openBlock(),e.createElementBlock("div",P,e.toDisplayString(u.value),1)):e.createCommentVNode("",!0)])}}},q=V._export_sfc(S,[["__scopeId","data-v-1f94a0e9"]]);exports.default=q;

package/dist/chats.server.js

@@ -47,17 +47,23 @@ function requireChats_routes() {
     const { verifySignUp, verifyUser } = middlewareFactory(db);
     wss.registerModule("chat", async (ws, msg) => {
       if (msg.type === "joinChat") {
-        ws.chatId = msg.chatId;
-      } else {
+        if (!msg.chatId) return;
+        if (!ws.activeChats) ws.activeChats = /* @__PURE__ */ 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);
       }
     });
-    app.use(function(req, res, next) {
+    app.get("/messages/:chatId", async (req, res) => {
+      const { chatId } = req.params;
+      const messages = await controller.getMessages(chatId);
+      res.json(messages);
+    });
+    app.use((req, res, next) => {
       res.header(
         "Access-Control-Allow-Headers",
         "Access-Control-Allow-Origin: *",
@@ -65,11 +71,6 @@ function requireChats_routes() {
       );
       next();
     });
-    app.get("/messages/:chatId", async (req, res) => {
-      const { chatId } = req.params;
-      const messages = await controller.getMessages(chatId);
-      res.json(messages);
-    });
   };
   return chats_routes;
 }

package/dist/chats.server.mjs

@@ -46,17 +46,23 @@ function requireChats_routes() {
     const { verifySignUp, verifyUser } = middlewareFactory(db);
     wss.registerModule("chat", async (ws, msg) => {
       if (msg.type === "joinChat") {
-        ws.chatId = msg.chatId;
-      } else {
+        if (!msg.chatId) return;
+        if (!ws.activeChats) ws.activeChats = /* @__PURE__ */ 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);
       }
     });
-    app.use(function(req, res, next) {
+    app.get("/messages/:chatId", async (req, res) => {
+      const { chatId } = req.params;
+      const messages = await controller.getMessages(chatId);
+      res.json(messages);
+    });
+    app.use((req, res, next) => {
       res.header(
         "Access-Control-Allow-Headers",
         "Access-Control-Allow-Origin: *",
@@ -64,11 +70,6 @@ function requireChats_routes() {
       );
       next();
     });
-    app.get("/messages/:chatId", async (req, res) => {
-      const { chatId } = req.params;
-      const messages = await controller.getMessages(chatId);
-      res.json(messages);
-    });
   };
   return chats_routes;
 }

package/dist/globals.server.js

@@ -64,20 +64,20 @@ function requireGlobals_websocket() {
       this.modules = /* @__PURE__ */ new Map();
       this.userConnections = /* @__PURE__ */ new Map();
       this.wss.on("connection", (ws, req) => {
-        ws.moduleName = null;
         ws.userId = req.userId || null;
+        ws.subscriptions = /* @__PURE__ */ new Set();
         if (ws.userId) {
           this._trackUserConnection(ws.userId, ws);
         }
         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);
             }
@@ -97,7 +97,7 @@ function requireGlobals_websocket() {
     }
     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);
@@ -117,25 +117,33 @@ function requireGlobals_websocket() {
       this.modules.set(moduleName, handler);
     }
     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) {
+      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/dist/globals.server.mjs

@@ -63,20 +63,20 @@ function requireGlobals_websocket() {
       this.modules = /* @__PURE__ */ new Map();
       this.userConnections = /* @__PURE__ */ new Map();
       this.wss.on("connection", (ws, req) => {
-        ws.moduleName = null;
         ws.userId = req.userId || null;
+        ws.subscriptions = /* @__PURE__ */ new Set();
         if (ws.userId) {
           this._trackUserConnection(ws.userId, ws);
         }
         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);
             }
@@ -96,7 +96,7 @@ function requireGlobals_websocket() {
     }
     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);
@@ -116,25 +116,33 @@ function requireGlobals_websocket() {
       this.modules.set(moduleName, handler);
     }
     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) {
+      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));
       }