@ozdao/martyrs 0.2.585 → 0.2.587

package/dist/visitors.service-B1dhhuSo.js

@@ -0,0 +1,83 @@
+import crypto from "crypto";
+const fingerprintCache = /* @__PURE__ */ new Map();
+const generateFingerprint = (req) => {
+  const { ip, headers } = req;
+  const userAgent = headers["user-agent"] || "";
+  const acceptLanguage = headers["accept-language"] || "";
+  const key = `${ip}-${userAgent}-${acceptLanguage}`;
+  if (fingerprintCache.has(key)) {
+    return fingerprintCache.get(key);
+  }
+  const hash = crypto.createHash("sha256");
+  hash.update(key);
+  const digest = hash.digest("hex");
+  fingerprintCache.set(key, digest);
+  return digest;
+};
+const generateVisitorId = () => crypto.randomBytes(16).toString("hex");
+let instance = null;
+function initVisitorsService(db) {
+  const Visitor = db.visitor;
+  async function findOrCreateVisitor(req) {
+    let visitorId = req.cookies?.visitorId;
+    let visitor = null;
+    if (visitorId && db.mongoose.Types.ObjectId.isValid(visitorId)) {
+      try {
+        visitor = await Visitor.findById(visitorId);
+      } catch (err) {
+      }
+    }
+    if (!visitor) {
+      const fingerprint = generateFingerprint(req);
+      visitor = await Visitor.findOneAndUpdate(
+        { fingerprint },
+        {
+          $setOnInsert: {
+            ip: req.ip,
+            userAgent: req.headers["user-agent"],
+            acceptLanguage: req.headers["accept-language"],
+            fingerprint
+          }
+        },
+        { upsert: true, new: true }
+      );
+    }
+    return visitor;
+  }
+  async function linkVisitorToUser({ visitorId, userId, sessionId = null }) {
+    const visitor = await Visitor.findByIdAndUpdate(
+      visitorId,
+      {
+        target: new db.mongoose.Types.ObjectId(userId),
+        linkedAt: /* @__PURE__ */ new Date()
+      },
+      { new: true }
+    );
+    return visitor;
+  }
+  async function getVisitorByFingerprint(fingerprint) {
+    return Visitor.findOne({ fingerprint });
+  }
+  async function getVisitorById(visitorId) {
+    return Visitor.findById(visitorId);
+  }
+  instance = {
+    findOrCreateVisitor,
+    linkVisitorToUser,
+    getVisitorByFingerprint,
+    getVisitorById,
+    generateFingerprint,
+    generateVisitorId
+  };
+  return instance;
+}
+function getVisitorsService() {
+  if (!instance) {
+    throw new Error("Visitors service not initialized. Call initVisitorsService(db) first.");
+  }
+  return instance;
+}
+export {
+  getVisitorsService as g,
+  initVisitorsService as i
+};

package/dist/wallet.server.js

@@ -1,6 +1,6 @@
 import * as QRCode from "qrcode";
-import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
-import { c as controllerFactory$1 } from "./tickets.controller-B7r0mK-5.js";
+import { m as middlewareIndexFactory } from "./index-kvBwwb0w.js";
+import { c as controllerFactory$1 } from "./tickets.controller-DdF85W-i.js";
 import { O as ObserverNamespaced } from "./core.observer-MZsqaE6F.js";
 import Stripe from "stripe";
 const controllerFactory = (db) => {
@@ -193,7 +193,7 @@ const ModelPayment = (db) => {
   const Payment = db.mongoose.model("Payment", PaymentSchema);
   return Payment;
 };
-function initializePayments(app, db, wss, origins, publicPath) {
+function initializePayments({ app, db, wss, origins, publicPath }) {
   db.payment = ModelPayment(db);
   if (app) {
     RoutesPayments(app, db, origins, publicPath);

package/dist/{web-BA6h6Z8P.js → web-O7lXcjg0.js}

@@ -1,4 +1,4 @@
-import { W as p } from "./main-xL-jtBkT.js";
+import { W as p } from "./main-BIf-WirR.js";
 class f extends p {
   constructor() {
     super(...arguments), this.group = "CapacitorStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.585",
+  "version": "0.2.587",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -72,7 +72,9 @@
     "build:builder:rspack": "rspack --config rspack.builder.config.js"
   },
   "dependencies": {
+    "beasties": "0.3.5",
     "@capacitor/core": "7.4.4",
+    "commander": "12.1.0",
     "@capacitor/preferences": "7.0.2",
     "@googlemaps/google-maps-services-js": "3.4.0",
     "@vitejs/plugin-vue": "6.0.1",

package/src/components/Button/Button.vue

@@ -1,8 +1,6 @@
 <script setup>
 import { ref } from 'vue'
 
-import Loader from '@martyrs/src/components/Loader/Loader.vue'
-
 import IconCheckmark from '@martyrs/src/modules/icons/navigation/IconCheckmark.vue';
 import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 
@@ -119,7 +117,9 @@ async function Submit() {
     </span>
 
     <span class="button-loader" :class="{ 'active': loading && showLoader }">
-      <Loader class=""/>
+      <span class="dot"></span>
+      <span class="dot"></span>
+      <span class="dot"></span>
     </span>
 
     <span class="button-success" :class="{ 'active': finished && showSucces }">
@@ -203,9 +203,17 @@ a.button {
   align-items: center;
   justify-content: center;
   gap: 8px;
-  transition: opacity 0.3s ease;
-}
+  transform: translateY(0);
+  opacity: 1;
+  transition:
+    opacity 0.2s cubic-bezier(0.4, 0, 0.2, 1),
+    transform 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 
+  &.hidden {
+    opacity: 0;
+    transform: translateY(4px);
+  }
+}
 
 .button-loader {
   position: absolute;
@@ -213,9 +221,39 @@ a.button {
   display: flex;
   align-items: center;
   justify-content: center;
+  gap: 4px;
   opacity: 0;
-  transition: opacity 0.3s ease;
+  transform: translateY(4px);
+  transition:
+    opacity 0.25s cubic-bezier(0.0, 0, 0.2, 1) 0.05s,
+    transform 0.25s cubic-bezier(0.0, 0, 0.2, 1) 0.05s;
   pointer-events: none;
+
+  &.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  .dot {
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: currentColor;
+    animation: dot-bounce 0.8s cubic-bezier(0.4, 0, 0.2, 1) infinite;
+
+    &:nth-child(1) { animation-delay: 0s; }
+    &:nth-child(2) { animation-delay: 0.12s; }
+    &:nth-child(3) { animation-delay: 0.24s; }
+  }
+}
+
+@keyframes dot-bounce {
+  0%, 100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-5px);
+  }
 }
 
 .button-success {
@@ -225,8 +263,16 @@ a.button {
   align-items: center;
   justify-content: center;
   opacity: 0;
-  transition: opacity 0.3s ease;
+  transform: translateY(4px);
+  transition:
+    opacity 0.2s cubic-bezier(0.0, 0, 0.2, 1),
+    transform 0.2s cubic-bezier(0.0, 0, 0.2, 1);
   pointer-events: none;
+
+  &.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 .button-error {
@@ -236,15 +282,15 @@ a.button {
   align-items: center;
   justify-content: center;
   opacity: 0;
-  transition: opacity 0.3s ease;
+  transform: translateY(4px);
+  transition:
+    opacity 0.2s cubic-bezier(0.0, 0, 0.2, 1),
+    transform 0.2s cubic-bezier(0.0, 0, 0.2, 1);
   pointer-events: none;
-}
 
-.active {
-  opacity: 1;
-}
-
-.hidden {
-  opacity: 0;
+  &.active {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 </style>

package/src/components/Loader/Loader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="circular-loader pos-relative z-index-1 w-100 h-100 w-max-2r h-max-2r" :class="{ 'circular-loader-centered': centered }">
+  <div class="circular-loader z-index-1 w-100 h-100 w-max-2r h-max-2r" :class="{ 'circular-loader-centered': centered }">
     <svg viewBox="25 25 50 50">
       <circle class="circular-loader-fill" cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />
       <circle class="circular-loader-circle" cx="50" cy="50" r="20" fill="none" stroke-width="4" stroke-miterlimit="10" />

package/src/components/Tooltip/Tooltip.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="cursor-pointer tooltip-container" @mouseover="showTooltip" @mouseleave="hideTooltip">
     <slot></slot>
-    <div  class="tooltip-content" :style="tooltipStyle">
-      <span>{{ text }}</span>
-    </div>
+    <Transition name="tooltip">
+      <div v-if="visible" class="tooltip-content" :style="{ left: posX, top: posY }">
+        <span>{{ text }}</span>
+      </div>
+    </Transition>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref } from 'vue';
 
-const props = defineProps({
+defineProps({
   text: {
     type: String,
     required: true
@@ -18,39 +20,45 @@ const props = defineProps({
 });
 
 const visible = ref(false);
-
-const tooltipStyle = reactive({
-  position: 'absolute',
-  width: 'max-content',
-  zIndex: 1000,
-  background: '#333',
-  color: '#fff',
-  padding: '5px',
-  borderRadius: '3px',
-  fontSize: '14px',
-  display: 'none',
-});
+const posX = ref('0px');
+const posY = ref('0px');
 
 function showTooltip(event) {
   visible.value = true;
-  tooltipStyle.left = `${(event.clientX / 100) + 10 }px`;
-  tooltipStyle.top = `${(event.clientY / 100) + 10 }px`;
-  tooltipStyle.display = 'block';
+  posX.value = `${(event.clientX / 100) + 10}px`;
+  posY.value = `${(event.clientY / 100) + 10}px`;
 }
 
 function hideTooltip() {
   visible.value = false;
-  tooltipStyle.display = 'none';
 }
 </script>
 
-<style >
+<style lang="scss">
 .tooltip-container {
   position: relative;
   display: inline-block;
 }
 
 .tooltip-content {
+  position: absolute;
+  width: max-content;
+  z-index: 1000;
+  background: #333;
+  color: #fff;
+  padding: 5px;
+  border-radius: 3px;
+  font-size: 14px;
   pointer-events: none;
 }
-</style>
+
+.tooltip-enter-active,
+.tooltip-leave-active {
+  transition: opacity 0.2s ease;
+}
+
+.tooltip-enter-from,
+.tooltip-leave-to {
+  opacity: 0;
+}
+</style>

package/src/modules/TASKS.MD

@@ -39,4 +39,33 @@
 4. Загружать настройки при старте приложения и кэшировать
 5. Обновить компоненты для получения настроек из store вместо config
 
-**Приоритет**: Высокий - статусы заказов особенно критичны для разных проектов
+**Приоритет**: Высокий - статусы заказов особенно критичны для разных проектов
+
+---
+
+### SSR Hydration mismatch в i18nManager
+
+**Проблема**: `i18nManager` — синглтон. При SSR порядок регистрации модулей может отличаться между сервером и клиентом. В результате `getMessages()` мержит локали в разном порядке, и одинаковые ключи (например `footer.copyright`) резолвятся по-разному.
+
+**Симптомы**:
+- Hydration mismatch: сервер рендерит "All rights reserved" (из core), клиент — "© 2025 OZ INTERACTIVE" (из app)
+- Текст из martyrs/core появляется вместо переводов проекта
+
+**Текущий костыль**: В проекте добавлять footer в overrides:
+```javascript
+// overrides.js
+export default {
+  core: {
+    en: { footer: en.footer },
+    ru: { footer: ru.footer }
+  }
+};
+```
+
+**Решение**:
+1. Гарантировать порядок регистрации модулей (app всегда после core)
+2. Или очищать i18nManager между SSR запросами
+3. Или использовать приоритеты при merge (app > core)
+
+**Затронутые файлы**:
+- `src/modules/core/views/classes/i18n.manager.js`