@ozdao/martyrs 0.2.468 → 0.2.470

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { a as o, t, b as d, c as r, u as l, v as i, w as p, d as u, x as n, e as m, y as M, F as S, z as c, f as F, A as g, L as h, g as b, M as k, E as x, n as B, o as C, h as T, i as U, S as f, j as w, B as D, C as E, k as I, D as L, l as P, q, p as y, U as A, r as j, s as v, m as z } from "./main-DEHjtgLs.mjs";
+import { a as o, t, b as d, c as r, u as l, v as i, w as p, d as u, x as n, e as m, y as M, F as S, z as c, f as F, A as g, L as h, g as b, M as k, E as x, n as B, o as C, h as T, i as U, S as f, j as w, B as D, C as E, k as I, D as L, l as P, q, p as y, U as A, r as j, s as v, m as z } from "./main-CTcal9qN.mjs";
 import "vue";
 export {
   o as Address,

package/dist/notifications.server.js

@@ -1,8 +1,10 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
+const require$$0$4 = require("mongoose");
 const require$$0 = require("apn");
 const require$$0$1 = require("firebase-admin");
 const require$$0$2 = require("path");
+const require$$0$3 = require("web-push");
 const mailing = require("./mailing-D4kWlk3_.js");
 require("dotenv");
 require("nodemailer");
@@ -123,6 +125,44 @@ function requireFcm_service() {
   fcm_service = FcmService;
   return fcm_service;
 }
+var webPush_service;
+var hasRequiredWebPush_service;
+function requireWebPush_service() {
+  if (hasRequiredWebPush_service) return webPush_service;
+  hasRequiredWebPush_service = 1;
+  const webpush = require$$0$3;
+  webpush.setVapidDetails(
+    `mailto:${process.env.VAPID_EMAIL}`,
+    process.env.VAPID_PUBLIC_KEY,
+    process.env.VAPID_PRIVATE_KEY
+  );
+  const WebPushService = {
+    send: async ({ token, title, body, data = {} }) => {
+      try {
+        const subscription = JSON.parse(token);
+        console.log("title is", title);
+        console.log("body is", body);
+        console.log("data is", data);
+        const payload = JSON.stringify({
+          title,
+          body,
+          icon: process.env.NOTIFICATION_ICON_URL || "/favicon.ico",
+          badge: process.env.NOTIFICATION_BADGE_URL || "/favicon.ico",
+          data
+        });
+        console.log("payload is", payload);
+        const result = await webpush.sendNotification(subscription, payload);
+        console.log("web push is", result);
+        return { success: true, statusCode: result.statusCode };
+      } catch (error) {
+        console.error("Web Push service error:", error);
+        throw error;
+      }
+    }
+  };
+  webPush_service = WebPushService;
+  return webPush_service;
+}
 var email_service;
 var hasRequiredEmail_service;
 function requireEmail_service() {
@@ -175,15 +215,23 @@ var hasRequiredNotification_service;
 function requireNotification_service() {
   if (hasRequiredNotification_service) return notification_service;
   hasRequiredNotification_service = 1;
-  const NotificationService = (db, wss) => {
+  const ObjectId = require$$0$4.Types.ObjectId;
+  notification_service = function(db, wss) {
+    wss.registerModule("notification", async (ws, msg) => {
+      console.log("[WebSocket][notification] msg:", msg);
+    });
     const processNotification = async (notification) => {
       try {
-        const userId = notification.userId;
+        const userId = notification.userId.toString();
         const preferences = await db.notificationPreference.find({
-          userId,
-          notificationType: notification.type
+          userId
+          // notificationType: notification.type
         });
-        const user = await db.mongoose.model("User").findById(userId);
+        console.log("userId", userId);
+        console.log("preferences", preferences);
+        console.log("notificationType", notification.type);
+        console.log("notification", notification);
+        const user = await db.mongoose.model("User").findById(new ObjectId(userId));
         if (!user) {
           throw new Error(`User not found: ${userId}`);
         }
@@ -209,6 +257,7 @@ function requireNotification_service() {
         if (preferences.length > 0) {
           channels = preferences.filter((pref) => pref.isEnabled).map((pref) => pref.channelType);
         }
+        console.log("channels", channels);
         for (const channel of channels) {
           const sendFunc = channelRouters[channel];
           if (sendFunc) {
@@ -253,10 +302,14 @@ function requireNotification_service() {
       }
     };
     const sendWebNotification = async (notification, user) => {
-      return wss.sendToUserInModule("notification", user._id, {
+      console.log(`[WebSocket][notification] sending to user ${user._id}`);
+      const result = await wss.sendToUserInModule("notification", user._id, {
         type: "notification",
         data: notification
       });
+      if (!result) {
+        console.log(`Failed to send web notification to user ${user._id}`);
+      }
     };
     const sendPushNotification = async (notification, user, device) => {
       const pushService = getPushServiceByDeviceType(device.deviceType);
@@ -272,7 +325,9 @@ function requireNotification_service() {
         return requireApns_service();
       } else if (deviceType === "android") {
         return requireFcm_service();
-      } else ;
+      } else {
+        return requireWebPush_service();
+      }
     };
     const sendEmailNotification = async (notification, user) => {
       const emailService = requireEmail_service();
@@ -304,7 +359,6 @@ function requireNotification_service() {
       processPendingNotifications
     };
   };
-  notification_service = NotificationService;
   return notification_service;
 }
 var notifications_controller;
@@ -312,11 +366,11 @@ var hasRequiredNotifications_controller;
 function requireNotifications_controller() {
   if (hasRequiredNotifications_controller) return notifications_controller;
   hasRequiredNotifications_controller = 1;
-  const NotificationsController = (db) => {
+  const NotificationsController = (db, wss) => {
     const create = async (req, res) => {
       try {
         const notification = await db.notification.create(req.body);
-        const notificationService = requireNotification_service()(db);
+        const notificationService = requireNotification_service()(db, wss);
         notificationService.processNotification(notification);
         return res.status(201).json(notification);
       } catch (err) {
@@ -429,8 +483,8 @@ var hasRequiredNotifications_routes;
 function requireNotifications_routes() {
   if (hasRequiredNotifications_routes) return notifications_routes;
   hasRequiredNotifications_routes = 1;
-  const notificationsRoutes = (app, db, origins, publicPath) => {
-    const controller = requireNotifications_controller()(db);
+  const notificationsRoutes = (app, db, wss, origins, publicPath) => {
+    const controller = requireNotifications_controller()(db, wss);
     app.get("/api/notifications/user/:userId", controller.getUserNotifications);
     app.post("/api/notifications", controller.create);
     app.put("/api/notifications/:id/read", controller.markAsRead);
@@ -535,15 +589,17 @@ function requireNotifications_server() {
   const NotificationService = requireNotification_service();
   const { getInstance } = globals_abac.requireGlobals_abac();
   function initializeNotifications(app, db, wss, origins, publicPath) {
+    console.log("wss init is", wss);
     db.notification = NotificationModel(db);
     db.userDevice = UserDeviceModel(db);
     db.notificationPreference = NotificationPreferenceModel(db);
     db.notificationLog = NotificationLogModel(db);
     getInstance(db);
     if (app) {
-      notificationsRoutes(app, db, origins, publicPath);
+      notificationsRoutes(app, db, wss, origins, publicPath);
     }
     const notificationService = NotificationService(db, wss);
+    console.log("[DEBUG] WSS in notification init:", wss);
     setInterval(() => {
       notificationService.processPendingNotifications();
     }, 6e4);

package/dist/notifications.server.mjs

@@ -1,7 +1,9 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
+import require$$0$4 from "mongoose";
 import require$$0 from "apn";
 import require$$0$1 from "firebase-admin";
 import require$$0$2 from "path";
+import require$$0$3 from "web-push";
 import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
 import "dotenv";
 import "nodemailer";
@@ -122,6 +124,44 @@ function requireFcm_service() {
   fcm_service = FcmService;
   return fcm_service;
 }
+var webPush_service;
+var hasRequiredWebPush_service;
+function requireWebPush_service() {
+  if (hasRequiredWebPush_service) return webPush_service;
+  hasRequiredWebPush_service = 1;
+  const webpush = require$$0$3;
+  webpush.setVapidDetails(
+    `mailto:${process.env.VAPID_EMAIL}`,
+    process.env.VAPID_PUBLIC_KEY,
+    process.env.VAPID_PRIVATE_KEY
+  );
+  const WebPushService = {
+    send: async ({ token, title, body, data = {} }) => {
+      try {
+        const subscription = JSON.parse(token);
+        console.log("title is", title);
+        console.log("body is", body);
+        console.log("data is", data);
+        const payload = JSON.stringify({
+          title,
+          body,
+          icon: process.env.NOTIFICATION_ICON_URL || "/favicon.ico",
+          badge: process.env.NOTIFICATION_BADGE_URL || "/favicon.ico",
+          data
+        });
+        console.log("payload is", payload);
+        const result = await webpush.sendNotification(subscription, payload);
+        console.log("web push is", result);
+        return { success: true, statusCode: result.statusCode };
+      } catch (error) {
+        console.error("Web Push service error:", error);
+        throw error;
+      }
+    }
+  };
+  webPush_service = WebPushService;
+  return webPush_service;
+}
 var email_service;
 var hasRequiredEmail_service;
 function requireEmail_service() {
@@ -174,15 +214,23 @@ var hasRequiredNotification_service;
 function requireNotification_service() {
   if (hasRequiredNotification_service) return notification_service;
   hasRequiredNotification_service = 1;
-  const NotificationService = (db, wss) => {
+  const ObjectId = require$$0$4.Types.ObjectId;
+  notification_service = function(db, wss) {
+    wss.registerModule("notification", async (ws, msg) => {
+      console.log("[WebSocket][notification] msg:", msg);
+    });
     const processNotification = async (notification) => {
       try {
-        const userId = notification.userId;
+        const userId = notification.userId.toString();
         const preferences = await db.notificationPreference.find({
-          userId,
-          notificationType: notification.type
+          userId
+          // notificationType: notification.type
         });
-        const user = await db.mongoose.model("User").findById(userId);
+        console.log("userId", userId);
+        console.log("preferences", preferences);
+        console.log("notificationType", notification.type);
+        console.log("notification", notification);
+        const user = await db.mongoose.model("User").findById(new ObjectId(userId));
         if (!user) {
           throw new Error(`User not found: ${userId}`);
         }
@@ -208,6 +256,7 @@ function requireNotification_service() {
         if (preferences.length > 0) {
           channels = preferences.filter((pref) => pref.isEnabled).map((pref) => pref.channelType);
         }
+        console.log("channels", channels);
         for (const channel of channels) {
           const sendFunc = channelRouters[channel];
           if (sendFunc) {
@@ -252,10 +301,14 @@ function requireNotification_service() {
       }
     };
     const sendWebNotification = async (notification, user) => {
-      return wss.sendToUserInModule("notification", user._id, {
+      console.log(`[WebSocket][notification] sending to user ${user._id}`);
+      const result = await wss.sendToUserInModule("notification", user._id, {
         type: "notification",
         data: notification
       });
+      if (!result) {
+        console.log(`Failed to send web notification to user ${user._id}`);
+      }
     };
     const sendPushNotification = async (notification, user, device) => {
       const pushService = getPushServiceByDeviceType(device.deviceType);
@@ -271,7 +324,9 @@ function requireNotification_service() {
         return requireApns_service();
       } else if (deviceType === "android") {
         return requireFcm_service();
-      } else ;
+      } else {
+        return requireWebPush_service();
+      }
     };
     const sendEmailNotification = async (notification, user) => {
       const emailService = requireEmail_service();
@@ -303,7 +358,6 @@ function requireNotification_service() {
       processPendingNotifications
     };
   };
-  notification_service = NotificationService;
   return notification_service;
 }
 var notifications_controller;
@@ -311,11 +365,11 @@ var hasRequiredNotifications_controller;
 function requireNotifications_controller() {
   if (hasRequiredNotifications_controller) return notifications_controller;
   hasRequiredNotifications_controller = 1;
-  const NotificationsController = (db) => {
+  const NotificationsController = (db, wss) => {
     const create = async (req, res) => {
       try {
         const notification = await db.notification.create(req.body);
-        const notificationService = requireNotification_service()(db);
+        const notificationService = requireNotification_service()(db, wss);
         notificationService.processNotification(notification);
         return res.status(201).json(notification);
       } catch (err) {
@@ -428,8 +482,8 @@ var hasRequiredNotifications_routes;
 function requireNotifications_routes() {
   if (hasRequiredNotifications_routes) return notifications_routes;
   hasRequiredNotifications_routes = 1;
-  const notificationsRoutes = (app, db, origins, publicPath) => {
-    const controller = requireNotifications_controller()(db);
+  const notificationsRoutes = (app, db, wss, origins, publicPath) => {
+    const controller = requireNotifications_controller()(db, wss);
     app.get("/api/notifications/user/:userId", controller.getUserNotifications);
     app.post("/api/notifications", controller.create);
     app.put("/api/notifications/:id/read", controller.markAsRead);
@@ -534,15 +588,17 @@ function requireNotifications_server() {
   const NotificationService = requireNotification_service();
   const { getInstance } = requireGlobals_abac();
   function initializeNotifications(app, db, wss, origins, publicPath) {
+    console.log("wss init is", wss);
     db.notification = NotificationModel(db);
     db.userDevice = UserDeviceModel(db);
     db.notificationPreference = NotificationPreferenceModel(db);
     db.notificationLog = NotificationLogModel(db);
     getInstance(db);
     if (app) {
-      notificationsRoutes(app, db, origins, publicPath);
+      notificationsRoutes(app, db, wss, origins, publicPath);
     }
     const notificationService = NotificationService(db, wss);
+    console.log("[DEBUG] WSS in notification init:", wss);
     setInterval(() => {
       notificationService.processPendingNotifications();
     }, 6e4);

package/dist/orders.server.js

@@ -513,6 +513,7 @@ ${formatPositions(order.positions)}
               userId: order.creator.target
               // Assuming creator.target holds the user ID
             };
+            console.log("notifiocatio data", JSON.stringify(notificationData));
             const notificationResponse = await fetch(`${process.env.API_URL || ""}/api/notifications`, {
               method: "POST",
               headers: {

package/dist/orders.server.mjs

@@ -512,6 +512,7 @@ ${formatPositions(order.positions)}
               userId: order.creator.target
               // Assuming creator.target holds the user ID
             };
+            console.log("notifiocatio data", JSON.stringify(notificationData));
             const notificationResponse = await fetch(`${process.env.API_URL || ""}/api/notifications`, {
               method: "POST",
               headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.468",
+  "version": "0.2.470",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Shader/Shader.vue

@@ -1,58 +1,79 @@
 <template>
   <canvas ref="refCanvas" />
 </template>
-
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 
 const props = defineProps({
   shader: {
     type: String,
     required: true
+  },
+  theme: {
+    type: String,
+    default: 'light' // или любое другое значение по умолчанию
   }
 })
 
 const refCanvas = ref(null)
+let gl = null
+let shaderProgram = null
+let themeUniformLocation = null
+
+// Функция для обновления uniform-переменных в шейдере
+const updateUniforms = () => {
+  if (!gl || !shaderProgram) return
+  
+  // Получаем location для переменной iTheme
+  if (!themeUniformLocation) {
+    themeUniformLocation = gl.getUniformLocation(shaderProgram, 'iTheme')
+  }
+  
+  // Устанавливаем значение: 0.0 для темной темы, 1.0 для светлой
+  const themeValue = props.theme === 'light' ? 1.0 : 0.0
+  gl.uniform1f(themeUniformLocation, themeValue)
+}
+
+// Следим за изменениями темы
+watch(() => props.theme, () => {
+  updateUniforms()
+}, { immediate: true })
 
 onMounted(() => {
   const canvas = refCanvas.value
-  const gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl')
-
+  gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl')
+  
   const vsSource = `
     attribute vec4 aVertexPosition;
     void main() {
       gl_Position = aVertexPosition;
     }
   `
-
   const fsSource = props.shader
-
+  
   function compileShader(gl, type, source) {
     const shader = gl.createShader(type)
     gl.shaderSource(shader, source)
     gl.compileShader(shader)
-
     if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
       alert('An error occurred compiling the shaders: ' + gl.getShaderInfoLog(shader))
       gl.deleteShader(shader)
       return null
     }
-
     return shader
   }
-
+  
   const vertexShader = compileShader(gl, gl.VERTEX_SHADER, vsSource)
   const fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fsSource)
-
-  const shaderProgram = gl.createProgram()
+  shaderProgram = gl.createProgram()
   gl.attachShader(shaderProgram, vertexShader)
   gl.attachShader(shaderProgram, fragmentShader)
   gl.linkProgram(shaderProgram)
-
+  
   if (!gl.getProgramParameter(shaderProgram, gl.LINK_STATUS)) {
     alert('Unable to initialize the shader program: ' + gl.getProgramInfoLog(shaderProgram))
   }
-
+  
   function resizeCanvasToDisplaySize(canvas) {
     const width = canvas.clientWidth * window.devicePixelRatio
     const height = canvas.clientHeight * window.devicePixelRatio
@@ -63,51 +84,49 @@ onMounted(() => {
     }
     return false
   }
-
+  
   function render() {
     if (resizeCanvasToDisplaySize(gl.canvas)) {
       gl.viewport(0, 0, gl.canvas.width, gl.canvas.height)
     }
-
+    
     gl.clearColor(0.0, 0.0, 0.0, 1.0)
     gl.clearDepth(1.0)
     gl.enable(gl.DEPTH_TEST)
     gl.depthFunc(gl.LEQUAL)
-
     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT)
     gl.useProgram(shaderProgram)
-
+    
     const positionBuffer = gl.createBuffer()
     gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer)
-
     const positions = [
       -1.0, 1.0,
       1.0, 1.0,
       -1.0, -1.0,
       1.0, -1.0,
     ]
-
     gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(positions), gl.STATIC_DRAW)
-
+    
     const vertexPosition = gl.getAttribLocation(shaderProgram, 'aVertexPosition')
     gl.vertexAttribPointer(vertexPosition, 2, gl.FLOAT, false, 0, 0)
     gl.enableVertexAttribArray(vertexPosition)
-
+    
     const timeUniformLocation = gl.getUniformLocation(shaderProgram, 'iTime')
     const resolutionUniformLocation = gl.getUniformLocation(shaderProgram, 'iResolution')
 
     gl.uniform1f(timeUniformLocation, performance.now() / 3000.0)
     gl.uniform2f(resolutionUniformLocation, gl.canvas.width, gl.canvas.height)
-
+    
+    // Обновляем uniform для темы
+    updateUniforms()
+    
     gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4)
-
     requestAnimationFrame(render)
   }
-
+  
   requestAnimationFrame(render)
 })
 </script>
-
 <style scoped>
   canvas {
     width: 100%;

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);
-  });
 };
-