@ozdao/martyrs 0.2.430 → 0.2.431

package/dist/martyrs/src/modules/products/components/pages/Products.vue.js

@@ -1,6 +1,6 @@
 import { ref, watch, onMounted, onUnmounted, resolveComponent, createElementBlock, openBlock, createCommentVNode, createBlock, createElementVNode, unref, createVNode, renderSlot, withCtx, Fragment, renderList } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import _sfc_main$2 from "../../../../components/Tab/Tab.vue.js";
+import _sfc_main$2 from "../../../../components/Tab/Tab.vue2.js";
 import _sfc_main$5 from "../../../../components/Feed/Feed.vue.js";
 /* empty css                                         */
 import "vue-i18n";

package/dist/martyrs/src/modules/products/components/sections/EditProductInfo.vue.cjs

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 ;/* empty css                                         */
-;/* empty css                                          */
+;/* empty css                                         */
 const Field = require("../../../../components/Field/Field.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const _hoisted_1 = { class: "flex-nowrap flex mn-b-small gap-thin" };

package/dist/martyrs/src/modules/products/components/sections/EditProductInfo.vue.js

@@ -1,6 +1,6 @@
 import { createElementBlock, openBlock, Fragment, createElementVNode, createVNode, createCommentVNode, withCtx } from "vue";
 /* empty css                                       */
-/* empty css                                        */
+/* empty css                                       */
 import Field from "../../../../components/Field/Field.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 const _hoisted_1 = { class: "flex-nowrap flex mn-b-small gap-thin" };

package/dist/martyrs/src/modules/products/components/sections/SectionProduct.vue.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Button = require("../../../../components/Button/Button.vue.cjs");
-const Tab = require("../../../../components/Tab/Tab.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.cjs");
+const Tab = require("../../../../components/Tab/Tab.vue2.cjs");
 const IconEdit = require("../../../icons/navigation/IconEdit.vue.cjs");
 const PlaceholderImage = require("../../../icons/placeholders/PlaceholderImage.vue.cjs");
 const Images360 = require("../blocks/Images360.vue.cjs");

package/dist/martyrs/src/modules/products/components/sections/SectionProduct.vue.js

@@ -1,6 +1,6 @@
 import { computed, ref, createElementBlock, openBlock, createElementVNode, createBlock, createCommentVNode, createVNode, unref, toDisplayString, Transition, withCtx, Fragment, renderList, createTextVNode } from "vue";
-import _sfc_main$4 from "../../../../components/Button/Button.vue.js";
-import _sfc_main$3 from "../../../../components/Tab/Tab.vue.js";
+import _sfc_main$4 from "../../../../components/Button/Button.vue2.js";
+import _sfc_main$3 from "../../../../components/Tab/Tab.vue2.js";
 import _sfc_main$1 from "../../../icons/navigation/IconEdit.vue.js";
 import PlaceholderImage from "../../../icons/placeholders/PlaceholderImage.vue.js";
 import Images360 from "../blocks/Images360.vue.js";

package/dist/martyrs/src/modules/rents/views/components/pages/GanttChart.vue.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Tab = require("../../../../../components/Tab/Tab.vue.cjs");
+const Tab = require("../../../../../components/Tab/Tab.vue2.cjs");
 const Select = require("../../../../../components/Select/Select.vue.cjs");
 const IconChevronRight = require("../../../../icons/navigation/IconChevronRight.vue.cjs");
 const IconChevronLeft = require("../../../../icons/navigation/IconChevronLeft.vue.cjs");

package/dist/martyrs/src/modules/rents/views/components/pages/GanttChart.vue.js

@@ -1,5 +1,5 @@
 import { useCssVars, ref, computed, watch, onMounted, nextTick, createElementBlock, openBlock, createElementVNode, createVNode, withDirectives, Fragment, renderList, toDisplayString, vModelSelect, createCommentVNode, normalizeClass, normalizeStyle } from "vue";
-import _sfc_main$1 from "../../../../../components/Tab/Tab.vue.js";
+import _sfc_main$1 from "../../../../../components/Tab/Tab.vue2.js";
 import Select from "../../../../../components/Select/Select.vue.js";
 import IconChevronRight from "../../../../icons/navigation/IconChevronRight.vue.js";
 import IconChevronLeft from "../../../../icons/navigation/IconChevronLeft.vue.js";

package/dist/martyrs/src/modules/rents/views/components/pages/Rents.vue.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Tab = require("../../../../../components/Tab/Tab.vue.cjs");
+const Tab = require("../../../../../components/Tab/Tab.vue2.cjs");
 const Feed = require("../../../../../components/Feed/Feed.vue.cjs");
 ;/* empty css                        */
 const GanttChart = require("./GanttChart.vue.cjs");

package/dist/martyrs/src/modules/rents/views/components/pages/Rents.vue.js

@@ -1,5 +1,5 @@
 import { ref, createElementBlock, openBlock, createElementVNode, createVNode, unref, toDisplayString, withCtx } from "vue";
-import _sfc_main$1 from "../../../../../components/Tab/Tab.vue.js";
+import _sfc_main$1 from "../../../../../components/Tab/Tab.vue2.js";
 import _sfc_main$2 from "../../../../../components/Feed/Feed.vue.js";
 /* empty css                      */
 import GanttChart from "./GanttChart.vue.js";

package/dist/martyrs/src/modules/rents/views/components/pages/RentsEdit.vue.cjs

@@ -4,7 +4,7 @@ const vue = require("vue");
 const Block = require("../../../../../components/Block/Block.vue.cjs");
 const Field = require("../../../../../components/Field/Field.vue.cjs");
 const Feed = require("../../../../../components/Feed/Feed.vue.cjs");
-const Popup = require("../../../../../components/Popup/Popup.vue2.cjs");
+const Popup = require("../../../../../components/Popup/Popup.vue.cjs");
 ;/* empty css                                                       */
 ;/* empty css                                             */
 const CardOrderItem = require("../../../../orders/components/blocks/CardOrderItem.vue.cjs");

package/dist/martyrs/src/modules/rents/views/components/pages/RentsEdit.vue.js

@@ -2,7 +2,7 @@ import { ref, computed, onMounted, createElementBlock, openBlock, createElementV
 import _sfc_main$4 from "../../../../../components/Block/Block.vue.js";
 import Field from "../../../../../components/Field/Field.vue.js";
 import _sfc_main$2 from "../../../../../components/Feed/Feed.vue.js";
-import _sfc_main$1 from "../../../../../components/Popup/Popup.vue2.js";
+import _sfc_main$1 from "../../../../../components/Popup/Popup.vue.js";
 /* empty css                                                     */
 /* empty css                                           */
 import _sfc_main$3 from "../../../../orders/components/blocks/CardOrderItem.vue.js";

package/dist/martyrs/src/modules/reports/components/sections/FormReport.vue.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
-const Popup = require("../../../../components/Popup/Popup.vue2.cjs");
-const Button = require("../../../../components/Button/Button.vue.cjs");
+const Popup = require("../../../../components/Popup/Popup.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const reports = require("../../store/reports.cjs");
 const _sfc_main = {

package/dist/martyrs/src/modules/reports/components/sections/FormReport.vue.js

@@ -1,6 +1,6 @@
 import { reactive, ref, createElementBlock, openBlock, renderSlot, createVNode, withCtx, createElementVNode, createTextVNode } from "vue";
-import _sfc_main$1 from "../../../../components/Popup/Popup.vue2.js";
-import _sfc_main$2 from "../../../../components/Button/Button.vue.js";
+import _sfc_main$1 from "../../../../components/Popup/Popup.vue.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue2.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import { actions } from "../../store/reports.js";
 const _sfc_main = {

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const IconEdit = require("../../../icons/navigation/IconEdit.vue.cjs");
 const IconCheckmark = require("../../../icons/navigation/IconCheckmark.vue.cjs");
-const Chips = require("../../../../components/Chips/Chips.vue.cjs");
+const Chips = require("../../../../components/Chips/Chips.vue2.cjs");
 const Map = require("../../../../components/Map/Map.vue.cjs");
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.cjs");
 const _hoisted_1 = { class: "pos-relative cols-2-1_3" };

package/dist/martyrs/src/modules/spots/components/blocks/CardSpot.vue.js

@@ -1,7 +1,7 @@
 import { createElementBlock, openBlock, createVNode, createElementVNode, createBlock, createCommentVNode, toDisplayString } from "vue";
 import _sfc_main$1 from "../../../icons/navigation/IconEdit.vue.js";
 import _sfc_main$2 from "../../../icons/navigation/IconCheckmark.vue.js";
-import _sfc_main$3 from "../../../../components/Chips/Chips.vue.js";
+import _sfc_main$3 from "../../../../components/Chips/Chips.vue2.js";
 import Map from "../../../../components/Map/Map.vue.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const _hoisted_1 = { class: "pos-relative cols-2-1_3" };

package/dist/martyrs/src/modules/spots/components/pages/Map.vue.cjs

@@ -3,7 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const vueRouter = require("vue-router");
 const index = require("../../../../../../node_modules/@googlemaps/js-api-loader/dist/index.cjs");
-const Button = require("../../../../components/Button/Button.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.cjs");
 const organizations = require("../../../organizations/store/organizations.cjs");
 const globals = require("../../../globals/views/store/globals.cjs");
 const marketplace = require("../../../marketplace/views/store/marketplace.cjs");

package/dist/martyrs/src/modules/spots/components/pages/Map.vue.js

@@ -1,7 +1,7 @@
 import { ref, onMounted, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, createTextVNode } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { Loader } from "../../../../../../node_modules/@googlemaps/js-api-loader/dist/index.js";
-import _sfc_main$1 from "../../../../components/Button/Button.vue.js";
+import _sfc_main$1 from "../../../../components/Button/Button.vue2.js";
 import { actions, state as state$2 } from "../../../organizations/store/organizations.js";
 import { state } from "../../../globals/views/store/globals.js";
 import { state as state$1 } from "../../../marketplace/views/store/marketplace.js";

package/dist/martyrs/src/modules/spots/components/pages/SpotEdit.vue.cjs

@@ -4,15 +4,15 @@ const vue = require("vue");
 const vueRouter = require("vue-router");
 const Block = require("../../../../components/Block/Block.vue.cjs");
 const UploadImage = require("../../../../components/UploadImage/UploadImage.vue.cjs");
-;/* empty css                                    */
+;/* empty css                                   */
 const Field = require("../../../../components/Field/Field.vue.cjs");
 const Select = require("../../../../components/Select/Select.vue.cjs");
 const Checkbox = require("../../../../components/Checkbox/Checkbox.vue.cjs");
 const Address = require("../../../../components/Address/Address.vue2.cjs");
 const LocationMarker = require("../../../../components/LocationMarker/LocationMarker.vue2.cjs");
-const Button = require("../../../../components/Button/Button.vue.cjs");
+const Button = require("../../../../components/Button/Button.vue2.cjs");
 require("vue-i18n");
-;/* empty css                                       */
+;/* empty css                                        */
 const spots = require("../../store/spots.cjs");
 const _hoisted_1 = { class: "for-transition w-100 cols-1 pd-thin gap-thin" };
 const _hoisted_2 = { class: "mn-r-auto" };

package/dist/martyrs/src/modules/spots/components/pages/SpotEdit.vue.js

@@ -2,15 +2,15 @@ import { ref, onMounted, createElementBlock, openBlock, createVNode, createEleme
 import { useRouter, useRoute } from "vue-router";
 import _sfc_main$1 from "../../../../components/Block/Block.vue.js";
 import _sfc_main$3 from "../../../../components/UploadImage/UploadImage.vue.js";
-/* empty css                                  */
+/* empty css                                 */
 import Field from "../../../../components/Field/Field.vue.js";
 import Select from "../../../../components/Select/Select.vue.js";
 import _sfc_main$4 from "../../../../components/Checkbox/Checkbox.vue.js";
 import _sfc_main$5 from "../../../../components/Address/Address.vue2.js";
 import _sfc_main$6 from "../../../../components/LocationMarker/LocationMarker.vue2.js";
-import _sfc_main$2 from "../../../../components/Button/Button.vue.js";
+import _sfc_main$2 from "../../../../components/Button/Button.vue2.js";
 import "vue-i18n";
-/* empty css                                     */
+/* empty css                                      */
 import { actions, state } from "../../store/spots.js";
 const _hoisted_1 = { class: "for-transition w-100 cols-1 pd-thin gap-thin" };
 const _hoisted_2 = { class: "mn-r-auto" };

package/dist/notifications.server.js

@@ -8,6 +8,89 @@ require("dotenv");
 require("nodemailer");
 require("axios");
 const globals_abac = require("./globals.abac-DT0VjfaZ.js");
+var websocket_service;
+var hasRequiredWebsocket_service;
+function requireWebsocket_service() {
+  if (hasRequiredWebsocket_service) return websocket_service;
+  hasRequiredWebsocket_service = 1;
+  const WebSocketService = (wss) => {
+    const connections = /* @__PURE__ */ new Map();
+    const addConnection = (userId, ws) => {
+      if (!connections.has(userId)) {
+        connections.set(userId, /* @__PURE__ */ new Set());
+      }
+      connections.get(userId).add(ws);
+      ws.on("close", () => {
+        removeConnection(userId, ws);
+      });
+    };
+    const removeConnection = (userId, ws) => {
+      if (connections.has(userId)) {
+        connections.get(userId).delete(ws);
+        if (connections.get(userId).size === 0) {
+          connections.delete(userId);
+        }
+      }
+    };
+    const sendToUser = (userId, data) => {
+      return new Promise((resolve) => {
+        try {
+          if (!connections.has(userId)) {
+            return resolve({ delivered: false, reason: "user-not-connected" });
+          }
+          const userSockets = connections.get(userId);
+          let delivered = 0;
+          userSockets.forEach((ws) => {
+            if (ws.readyState === 1) {
+              ws.send(JSON.stringify({
+                type: "notification",
+                data
+              }));
+              delivered++;
+            }
+          });
+          console.log(userSockets);
+          resolve({ delivered: delivered > 0, connections: delivered });
+        } catch (error) {
+          console.error("Ошибка отправки уведомления:", error);
+          resolve({ delivered: false, reason: "error", error: error.message });
+        }
+      });
+    };
+    const broadcast = (data) => {
+      return new Promise((resolve) => {
+        let count = 0;
+        wss.clients.forEach((ws) => {
+          if (ws.readyState === 1) {
+            try {
+              ws.send(JSON.stringify({
+                type: "notification",
+                data
+              }));
+              count++;
+            } catch (e) {
+              console.error("Ошибка рассылки клиенту:", e);
+            }
+          }
+        });
+        resolve({ delivered: count > 0, connections: count });
+      });
+    };
+    wss.on("connection", (ws, req) => {
+      if (req.userId) {
+        addConnection(req.userId, ws);
+      }
+    });
+    return {
+      addConnection,
+      removeConnection,
+      sendToUser,
+      broadcast
+    };
+  };
+  websocket_service = WebSocketService;
+  return websocket_service;
+}
 var apns_service;
 var hasRequiredApns_service;
 function requireApns_service() {
@@ -252,8 +335,9 @@ function requireNotification_service() {
         );
       }
     };
+    const webSocketService = requireWebsocket_service()(wss);
     const sendWebNotification = async (notification, user) => {
-      return wss.sendToUser(user._id, {
+      return webSocketService.sendToUser(user._id, {
         type: "notification",
         data: notification
       });

package/dist/notifications.server.mjs

@@ -7,6 +7,89 @@ import "dotenv";
 import "nodemailer";
 import "axios";
 import { r as requireGlobals_abac } from "./globals.abac-CvmZM8XG.mjs";
+var websocket_service;
+var hasRequiredWebsocket_service;
+function requireWebsocket_service() {
+  if (hasRequiredWebsocket_service) return websocket_service;
+  hasRequiredWebsocket_service = 1;
+  const WebSocketService = (wss) => {
+    const connections = /* @__PURE__ */ new Map();
+    const addConnection = (userId, ws) => {
+      if (!connections.has(userId)) {
+        connections.set(userId, /* @__PURE__ */ new Set());
+      }
+      connections.get(userId).add(ws);
+      ws.on("close", () => {
+        removeConnection(userId, ws);
+      });
+    };
+    const removeConnection = (userId, ws) => {
+      if (connections.has(userId)) {
+        connections.get(userId).delete(ws);
+        if (connections.get(userId).size === 0) {
+          connections.delete(userId);
+        }
+      }
+    };
+    const sendToUser = (userId, data) => {
+      return new Promise((resolve) => {
+        try {
+          if (!connections.has(userId)) {
+            return resolve({ delivered: false, reason: "user-not-connected" });
+          }
+          const userSockets = connections.get(userId);
+          let delivered = 0;
+          userSockets.forEach((ws) => {
+            if (ws.readyState === 1) {
+              ws.send(JSON.stringify({
+                type: "notification",
+                data
+              }));
+              delivered++;
+            }
+          });
+          console.log(userSockets);
+          resolve({ delivered: delivered > 0, connections: delivered });
+        } catch (error) {
+          console.error("Ошибка отправки уведомления:", error);
+          resolve({ delivered: false, reason: "error", error: error.message });
+        }
+      });
+    };
+    const broadcast = (data) => {
+      return new Promise((resolve) => {
+        let count = 0;
+        wss.clients.forEach((ws) => {
+          if (ws.readyState === 1) {
+            try {
+              ws.send(JSON.stringify({
+                type: "notification",
+                data
+              }));
+              count++;
+            } catch (e) {
+              console.error("Ошибка рассылки клиенту:", e);
+            }
+          }
+        });
+        resolve({ delivered: count > 0, connections: count });
+      });
+    };
+    wss.on("connection", (ws, req) => {
+      if (req.userId) {
+        addConnection(req.userId, ws);
+      }
+    });
+    return {
+      addConnection,
+      removeConnection,
+      sendToUser,
+      broadcast
+    };
+  };
+  websocket_service = WebSocketService;
+  return websocket_service;
+}
 var apns_service;
 var hasRequiredApns_service;
 function requireApns_service() {
@@ -251,8 +334,9 @@ function requireNotification_service() {
         );
       }
     };
+    const webSocketService = requireWebsocket_service()(wss);
     const sendWebNotification = async (notification, user) => {
-      return wss.sendToUser(user._id, {
+      return webSocketService.sendToUser(user._id, {
         type: "notification",
         data: notification
       });

package/dist/orders.server.js

@@ -241,24 +241,6 @@ function requireOrders_controller() {
   hasRequiredOrders_controller = 1;
   const queryProcessorGlobals = queryProcessor.requireQueryProcessor();
   const { sendChatMessageTelegram } = mailing.requireMailing();
-  function formatPositions(positions) {
-    return positions.map((pos) => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join("\n");
-  }
-  function formatOrderMessage(order) {
-    return `
-    🆕 New Order Received!
-    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : "No phone"})
-    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + " " + order.customer?.messenger?.value : "None"}
-    🏢 Organization: ${order.organization}
-    📦 Positions:
-${formatPositions(order.positions)}
-    📝 Comment: ${order.comment ? order.comment : "No comment"}
-    💳 Payment: ${order.payment?.type}
-    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
-    📌 Status: ${order.status}
-    🧑 Agent: ${order.referralCode}
-  `;
-  }
   async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
     let searchCriteria = {};
     if (customerInfo.phone) {
@@ -301,14 +283,6 @@ ${formatPositions(order.positions)}
     }
     return customer;
   }
-  async function sendOrderMessage(orderData) {
-    try {
-      const formattedMessage = formatOrderMessage(orderData);
-      await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);
-    } catch (err) {
-      console.error(err);
-    }
-  }
   const controllerFactory = (db2) => {
     const Order = db2.order;
     const Customer = db2.customer;
@@ -382,7 +356,6 @@ ${formatPositions(order.positions)}
           }
         }
         await session.commitTransaction();
-        sendOrderMessage(orderData);
         res.status(201).send(createdOrder);
       } catch (err) {
         await session.abortTransaction();

package/dist/orders.server.mjs

@@ -240,24 +240,6 @@ function requireOrders_controller() {
   hasRequiredOrders_controller = 1;
   const queryProcessorGlobals = requireQueryProcessor();
   const { sendChatMessageTelegram } = requireMailing();
-  function formatPositions(positions) {
-    return positions.map((pos) => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join("\n");
-  }
-  function formatOrderMessage(order) {
-    return `
-    🆕 New Order Received!
-    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : "No phone"})
-    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + " " + order.customer?.messenger?.value : "None"}
-    🏢 Organization: ${order.organization}
-    📦 Positions:
-${formatPositions(order.positions)}
-    📝 Comment: ${order.comment ? order.comment : "No comment"}
-    💳 Payment: ${order.payment?.type}
-    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
-    📌 Status: ${order.status}
-    🧑 Agent: ${order.referralCode}
-  `;
-  }
   async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
     let searchCriteria = {};
     if (customerInfo.phone) {
@@ -300,14 +282,6 @@ ${formatPositions(order.positions)}
     }
     return customer;
   }
-  async function sendOrderMessage(orderData) {
-    try {
-      const formattedMessage = formatOrderMessage(orderData);
-      await sendChatMessageTelegram(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);
-    } catch (err) {
-      console.error(err);
-    }
-  }
   const controllerFactory = (db2) => {
     const Order = db2.order;
     const Customer = db2.customer;
@@ -381,7 +355,6 @@ ${formatPositions(order.positions)}
           }
         }
         await session.commitTransaction();
-        sendOrderMessage(orderData);
         res.status(201).send(createdOrder);
       } catch (err) {
         await session.abortTransaction();