@ozdao/martyrs 0.2.481 → 0.2.483

package/src/modules/globals/controllers/classes/abac/v2/abac-ws-fixed.js

@@ -0,0 +1,237 @@
+// @martyrs/src/modules/globals/controllers/classes/abac/abac.adapter.ws.js
+export default class ABACWebSocketAdapter {
+  constructor(abac) {
+    this.abac = abac;
+  }
+
+  /**
+   * WebSocket handler для проверки доступа
+   * @param {string} moduleName - Имя модуля
+   * @param {Object} [options] - Опции
+   * @returns {Function} Handler функция
+   */
+  handler(moduleName, options = {}) {
+    return async (ws, message) => {
+      try {
+        const { action = 'access', resource = moduleName } = options;
+        
+        const context = this._buildContext(ws, resource, action, message, options);
+        const accessResult = await this.abac.checkAccess(context, context.customPolicies);
+        
+        if (!accessResult.allow) {
+          await this._sendError(ws, 'ACCESS_DENIED', accessResult.reason);
+          return false;
+        }
+
+        // Проверка полей если включена
+        if (options.checkFields && message) {
+          const fieldsResult = await this.abac.checkFields(context, message, action);
+          
+          if (fieldsResult.errors.length > 0 && options.strictFieldsMode) {
+            await this._sendError(ws, 'FIELD_VALIDATION_ERROR', 'Field validation failed', {
+              fields: fieldsResult.errors
+            });
+            return false;
+          }
+          
+          // Возвращаем отфильтрованные данные
+          return {
+            allowed: true,
+            data: fieldsResult.transformed || fieldsResult.allowed,
+            fieldsResult
+          };
+        }
+
+        return true;
+      } catch (error) {
+        this.abac.logger?.error('WebSocket access control error', {
+          module: moduleName,
+          error: error.message,
+          stack: error.stack
+        });
+        
+        await this._sendError(ws, 'INTERNAL_ERROR', 'Access control error');
+        return false;
+      }
+    };
+  }
+
+  /**
+   * RPC handler для вызовов через WebSocket
+   * @param {string} module - Модуль
+   * @param {string} method - Метод
+   * @param {Object} [options] - Опции
+   * @returns {Function} RPC handler
+   */
+  rpcHandler(module, method, options = {}) {
+    return async (params, rpcContext) => {
+      try {
+        const context = this._buildRPCContext(rpcContext, module, method, params, options);
+        const accessResult = await this.abac.checkAccess(context, context.customPolicies);
+        
+        if (!accessResult.allow) {
+          throw new RPCError('ACCESS_DENIED', accessResult.reason);
+        }
+
+        // Проверка полей если нужно
+        if (options.checkFields && params) {
+          const fieldsResult = await this.abac.checkFields(context, params, method);
+          
+          if (fieldsResult.errors.length > 0) {
+            if (options.strictFieldsMode) {
+              throw new RPCError(
+                'FIELD_VALIDATION_ERROR',
+                `Fields validation failed: ${fieldsResult.errors.map(e => e.path).join(', ')}`
+              );
+            }
+            
+            // Логируем ошибки в нестрогом режиме
+            this.abac.logger?.warn('RPC field validation errors', {
+              module,
+              method,
+              errors: fieldsResult.errors
+            });
+          }
+          
+          // Возвращаем трансформированные данные
+          return fieldsResult.transformed || fieldsResult.allowed;
+        }
+
+        return params;
+      } catch (error) {
+        // Пробрасываем RPC ошибки как есть
+        if (error instanceof RPCError) {
+          throw error;
+        }
+        
+        this.abac.logger?.error('RPC access control error', {
+          module,
+          method,
+          error: error.message,
+          stack: error.stack
+        });
+        
+        throw new RPCError('INTERNAL_ERROR', 'Access control error');
+      }
+    };
+  }
+
+  /**
+   * Middleware для обработки WebSocket сообщений
+   * @param {Object} [options] - Опции
+   * @returns {Function} Middleware функция
+   */
+  messageMiddleware(options = {}) {
+    return async (ws, message, next) => {
+      try {
+        const { resource = 'message', action = 'send' } = options;
+        const context = this._buildContext(ws, resource, action, message, options);
+        
+        const accessResult = await this.abac.checkAccess(context, options.policies || {});
+        
+        if (!accessResult.allow) {
+          await this._sendError(ws, 'ACCESS_DENIED', accessResult.reason);
+          return;
+        }
+        
+        // Сохраняем результат в контексте WS
+        ws.abacContext = context;
+        ws.abacAccessResult = accessResult;
+        
+        next();
+      } catch (error) {
+        this.abac.logger?.error('WebSocket middleware error', {
+          error: error.message
+        });
+        
+        await this._sendError(ws, 'INTERNAL_ERROR', 'Access control error');
+      }
+    };
+  }
+
+  /**
+   * Построение контекста для WebSocket
+   * @private
+   */
+  _buildContext(ws, resource, action, data, options) {
+    return {
+      user: ws.userId || ws.user?.id,
+      resource,
+      action,
+      data: data || {},
+      socket: ws,
+      customPolicies: options.policies || {},
+      options,
+      // Дополнительная информация о соединении
+      connectionInfo: {
+        id: ws.id,
+        remoteAddress: ws._socket?.remoteAddress,
+        protocol: ws.protocol,
+        readyState: ws.readyState
+      }
+    };
+  }
+
+  /**
+   * Построение контекста для RPC
+   * @private
+   */
+  _buildRPCContext(rpcContext, module, method, params, options) {
+    return {
+      user: rpcContext.userId || rpcContext.user?.id,
+      resource: module,
+      action: method,
+      data: params || {},
+      socket: rpcContext.ws,
+      customPolicies: options.policies || {},
+      options,
+      rpcInfo: {
+        id: rpcContext.id,
+        module,
+        method,
+        timestamp: new Date().toISOString()
+      }
+    };
+  }
+
+  /**
+   * Отправка ошибки через WebSocket
+   * @private
+   */
+  async _sendError(ws, code, message, details = {}) {
+    if (ws.readyState !== 1) { // WebSocket.OPEN
+      return;
+    }
+    
+    try {
+      const errorMessage = JSON.stringify({
+        type: 'error',
+        error: {
+          code,
+          message,
+          ...details
+        },
+        timestamp: new Date().toISOString()
+      });
+      
+      ws.send(errorMessage);
+    } catch (error) {
+      this.abac.logger?.error('Failed to send WebSocket error', {
+        originalError: { code, message },
+        sendError: error.message
+      });
+    }
+  }
+}
+
+/**
+ * Класс для RPC ошибок
+ */
+class RPCError extends Error {
+  constructor(code, message, details = {}) {
+    super(message);
+    this.name = 'RPCError';
+    this.code = code;
+    this.details = details;
+  }
+}

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

@@ -20,17 +20,32 @@ import * as storeGlobals from './views/store/globals.js';
 import * as appRenderer from './views/utils/vue-app-renderer.js';
 
 import alertPlugin from './views/plugins/alert.plugin.js';
+import popupAuthPlugin from './views/plugins/popup.auth.plugin.js';
 import datePickerPlugin from './views/plugins/date-picker.plugin.js';
 import storeDebuggerPlugin from './views/plugins/store-debugger/store-debugger.plugin.js';
 
 import store from './views/classes/store.js';
-
 import websockets from './views/classes/globals.websocket.js';
+import { i18nManager }  from '@martyrs/src/modules/globals/views/classes/globals.i18n.js';
+
+import en from './locales/en.js';
+import ru from './locales/ru.js';
+
 
 // Пример функции инициализации для модуля заказов
 function initializeGlobals(app, store, router, config, options = {}) {
   const route = options.route || 'Home';
 
+  const locales = {
+    en: en,
+    ru: ru,
+    es: {}  // или es: undefined
+  };
+
+  i18nManager.register('globals', locales);
+
+  console.log('mesages is',  i18nManager.getAllMessages())
+
   const envVariables = ['NODE_ENV', 'PORT', 'APP_NAME', 'DOMAIN_URL', 'API_URL', 'WSS_URL', 'FILE_SERVER_URL', 'WDT_TOKEN', 'WDM_URL_PROD', 'GOOGLE_MAPS_API_KEY', 'MOBILE_APP'];
 
   app.config.globalProperties.DOMAIN_URL = process.env.DOMAIN_URL;
@@ -42,6 +57,7 @@ function initializeGlobals(app, store, router, config, options = {}) {
   app.mixin(mixins.globalMixins);
 
   app.use(alertPlugin);
+  app.use(popupAuthPlugin);
   app.use(datePickerPlugin);
   app.use(storeDebuggerPlugin, store);
 

package/src/modules/globals/locales/en.js

@@ -0,0 +1,21 @@
+// @martyrs/src/modules/globals/locales/en.js
+export default {
+  globals: {
+    errors: {
+      USER_NOT_FOUND: 'Such user is not registered',
+      USER_ALREADY_REGISTERED: 'Such user is already registered!',
+      USER_NOT_REGISTERED_YET: 'This user has not been registered yet!',
+      USER_PHONE_OR_PASSWORD_NOT_FOUND: 'User with such phone or password not found!',
+      INCORRECT_PASSWORD_ENTERED: 'You entered an incorrect password!',
+      INVALID_INVITATION_CODE: 'Incorrect invitation code.',
+      MISSING_REQUIRED_PARAMETERS: 'Missing required parameters.',
+      ERROR_UPDATING_USER: 'Something wrong when updating user.',
+      PASSWORDS_DO_NOT_MATCH: 'The passwords you entered do not match. Please correct the errors and try again.',
+      CODE_NOT_SENT: 'Something went wrong and the code was not sent. Please try again.',
+      INPUT_ERROR: 'Please enter only a four-digit code.',
+      WRONG_CODE: 'You entered an incorrect code. Please try again.',
+      POST_URL_ALREADY_IN_USE: 'Failed! Blogpost with this URL is already in use!',
+      NAME_CANNOT_BE_EMPTY: 'Error: Name cannot be empty. Please enter a name.',
+    }
+  }
+};

package/src/modules/globals/locales/index.js

@@ -0,0 +1,8 @@
+// @martyrs/src/modules/globals/locales/index.js
+import en from './en.js';
+import ru from './ru.js';
+
+export default {
+  en,
+  ru
+};

package/src/modules/globals/locales/ru.js

@@ -0,0 +1,21 @@
+// @martyrs/src/modules/globals/locales/ru.js
+export default {
+  globals: {
+    errors: {
+      USER_NOT_FOUND: 'Такой пользователь не зарегистрирован!',
+      USER_ALREADY_REGISTERED: 'Такой пользователь уже зарегистрирован!',
+      USER_NOT_REGISTERED_YET: 'Такой пользователь еще не зарегистрирован!',
+      USER_PHONE_OR_PASSWORD_NOT_FOUND: 'Пользователь с таким телефоном или паролем не найден!',
+      INCORRECT_PASSWORD_ENTERED: 'Вы ввели неверный пароль!',
+      INVALID_INVITATION_CODE: 'Неверный код приглашения',
+      MISSING_REQUIRED_PARAMETERS: 'Отсутствуют необходимые параметры.',
+      ERROR_UPDATING_USER: 'Произошла ошибка при обновлении пользователя.',
+      PASSWORDS_DO_NOT_MATCH: 'Введенные вами пароли не совпадают. Исправьте ошибки и попробуйте еще раз.',
+      CODE_NOT_SENT: 'Что-то пошло не так и код не был отправлен. Попробуйте еще раз.',
+      INPUT_ERROR: 'Вставьте только четырехзначный код.',
+      WRONG_CODE: 'Вы ввели неверный код. Попробуйте еще раз.',
+      POST_URL_ALREADY_IN_USE: 'Ошибка! Публикация с этим URL уже используется!',
+      NAME_CANNOT_BE_EMPTY: 'Ошибка: Название не может быть пустым. Пожалуйста, введите название.',
+    }
+  }
+};

package/src/modules/globals/views/classes/globals.i18n.js

@@ -0,0 +1,84 @@
+import merge from 'lodash.merge';
+
+class I18nManager {
+  constructor() {
+    this.moduleLocales = new Map();
+    this.overrides = new Map();
+    this.extensions = new Map();
+  }
+
+  register(moduleName, locales) {
+    if (typeof moduleName !== 'string' || !this.isValidLocales(locales)) {
+      throw new TypeError('Invalid arguments for register()');
+    }
+    this.moduleLocales.set(moduleName, locales);
+    return this;
+  }
+
+  extend(moduleName, locales) {
+    if (!this.isValidLocales(locales)) throw new TypeError('Invalid locales for extend()');
+    const existing = this.extensions.get(moduleName) || {};
+    merge(existing, locales);
+    this.extensions.set(moduleName, existing);
+    return this;
+  }
+
+  override(moduleName, locales) {
+    if (!this.isValidLocales(locales)) throw new TypeError('Invalid locales for override()');
+    const existing = this.overrides.get(moduleName) || {};
+    merge(existing, locales);
+    this.overrides.set(moduleName, existing);
+    return this;
+  }
+
+  getMessages(locale) {
+    const result = {};
+
+    for (const [, moduleLocales] of this.moduleLocales) {
+      if (moduleLocales[locale]) {
+        merge(result, moduleLocales[locale]);
+      }
+    }
+
+    for (const [, ext] of this.extensions) {
+      if (ext[locale]) {
+        merge(result, ext[locale]);
+      }
+    }
+
+    for (const [, override] of this.overrides) {
+      if (override[locale]) {
+        merge(result, override[locale]);
+      }
+    }
+
+    return result;
+  }
+
+  getAllMessages() {
+    const allLocales = new Set();
+
+    for (const moduleLocales of this.moduleLocales.values()) {
+      Object.keys(moduleLocales).forEach(locale => allLocales.add(locale));
+    }
+
+    const messages = {};
+
+    for (const locale of allLocales) {
+      messages[locale] = this.getMessages(locale);
+    }
+
+    return messages;
+  }
+
+  isValidLocales(obj) {
+    return this.isObject(obj) && Object.values(obj).every(this.isObject);
+  }
+
+  isObject(item) {
+    return item && typeof item === 'object' && !Array.isArray(item);
+  }
+}
+
+export const i18nManager = new I18nManager();
+export default I18nManager;

package/src/modules/globals/views/components/blocks/CardFooter.vue

@@ -3,14 +3,14 @@
     👁️ {{ views }}
     <span class="mn-r-small mn-l-small d-block">·</span>
     <div class="cursor-pointer">
-      <div class="cursor-pointer" @click="addReaction('like')" v-if="!isReacted">
+      <div class="cursor-pointer hover-bg-white" @click="addReaction('like')" v-if="!isReacted">
         👍 {{ reactionsCount }}
       </div>
-      <div class="cursor-pointer" @click="deleteReaction('like')" v-if="isReacted">
+      <div class="cursor-pointer hover-bg-white" @click="deleteReaction('like')" v-if="isReacted">
         👍 {{ reactionsCount }}
       </div>
     </div>
-    <span class="mn-r-small mn-l-small d-block">·</span>
+    <span class="mn-r-small hover-bg-white mn-l-small d-block">·</span>
     💬 {{ commentsCount }}
   </footer>
 </template>

package/src/modules/globals/views/components/blocks/CardHeader.vue

@@ -37,7 +37,7 @@
 
 				<div 
 					v-if="type !== 'short'"
-					class="flex flex-nowrap t-medium w-100 o-hidden pos-relative"
+					class="flex flex-nowrap t-medium w-100 pos-relative"
 				>
 					<span 
 						@click.stop="$router.push({

package/src/modules/globals/views/components/blocks/PopupAuth.vue

@@ -0,0 +1,66 @@
+<!-- @martyrs/src/modules/auth/views/components/AuthDialog.vue -->
+<template>
+  <Popup 
+    :isPopupOpen="authState.visible" 
+    @close-popup="closeAuth"
+    class="bg-white radius-medium pd-medium"
+  >
+    <div class="t-center">
+      <img loading="lazy" :src="'/logo/logo.svg'" class="i-extra radius-small mn-b-medium">
+      <h3 class="mn-b-medium">{{ authState.title || 'Welcome' }}</h3>
+      <p class="mn-b-semi t-transp">{{ authState.subtitle || 'Please sign in or create an account to continue.' }}</p>
+      
+      <div class="flex-column flex gap-thin">
+        <Button 
+          :submit="handleSignUp" 
+          class="bg-main radius-small mn-b-small pd-thin"
+        >
+          Sign Up
+        </Button>
+        
+        <span>
+          Already have an account? 
+          <a @click="handleSignIn" class="t-second cursor-pointer">Sign in</a>
+        </span>
+      </div>
+    </div>
+  </Popup>
+</template>
+
+<script setup>
+import { useRouter, useRoute } from 'vue-router';
+import Popup from '@martyrs/src/components/Popup/Popup.vue';
+import Button from '@martyrs/src/components/Button/Button.vue';
+
+const props = defineProps({
+  authState: {
+    type: Object,
+    required: true
+  },
+  closeAuth: {
+    type: Function,
+    required: true
+  }
+});
+
+const router = useRouter();
+const route = useRoute();
+
+const handleSignIn = async () => {
+  const returnUrl = props.authState.returnUrl || route.fullPath;
+  await router.push({ 
+    name: 'Sign In',
+    query: { returnUrl }
+  });
+  props.closeAuth('signin');
+};
+
+const handleSignUp = async () => {
+  const returnUrl = props.authState.returnUrl || route.fullPath;
+  await router.push({ 
+    name: 'Sign Up',
+    query: { returnUrl }
+  });
+  props.closeAuth('signup');
+};
+</script>

package/src/modules/globals/views/components/layouts/Client.vue

@@ -114,37 +114,48 @@
 	    </component>
 		  <!-- rows-1-min0_max1 z-index-1 pos-relative w-100 h-100 -->
 		  <div class="rows-1-min0_max1 z-index-1 pos-relative w-100 h-100">
-  			<Status 
-					v-if="globals.state.error.show" 
-					:data="globals.state.error"
-					@close="globals.state.error.show = false"
-					class="z-index-7" 
-				/>
-				 <Suspense @resolve="onSuspenseResolved">
-					<router-view  
-						id="view"
-						v-slot="{ Component, route }" 
-						:class="{
-							'scroll-hide': MOBILE_APP,
-						}"
-						class="o-y-scroll o-x-hidden flex flex-column pos-relative h-100"
-					>
-						<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
-			      	<component 
-			      		ref="page"  
-			      		:is="Component" 
-			      		:key="route.path"
-			      		class="w-100 h-min-100"
-		      		 	@page-loading="handlePageLoading"
-	              @page-loaded="handlePageLoaded"
-			      	/>
-			      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
-			      	<!--  -->
-			      </transition>
-
-			      <!-- <Footer /> -->
-					</router-view>
-				</Suspense>
+		  	<div class="o-y-scroll o-x-hidden h-100">
+	  			<Status 
+	  				v-if="globals.state.error.show"
+						:data="globals.state.error"
+						@close="globals.state.error.show = false"
+						class="z-index-7" 
+					/>
+					<div class="h-min-100 pos-relative w-100">
+				 		<Suspense @resolve="onSuspenseResolved">
+							<router-view  
+								id="view"
+								v-slot="{ Component, route }" 
+								:class="{
+									'scroll-hide': MOBILE_APP,
+								}"
+								class="h-min-100 pos-relative w-100"
+							>
+								<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
+					      	<component 
+					      		ref="page"  
+					      		:is="Component" 
+					      		:key="route.path"
+					      		class="w-100 h-min-100"
+				      		 	@page-loading="handlePageLoading"
+			              @page-loaded="handlePageLoaded"
+					      	/>
+					      	<!-- Key пока выключил непонятно какие проблемы это вызовет -->
+					      	<!--  -->
+					      </transition>
+						  </router-view>
+						</Suspense>
+				  </div>
+			  
+	        <component
+						v-if="!MOBILE_APP && route.meta.footer && !route.meta.hideFooter"
+			      ref="footer" 
+			      :is="route.meta.footer"
+			      :theme="headerTheme"
+			      :logotype="route.meta.logotype"
+			      :location="route.meta.location"
+			    />
+				</div>
 			</div>
 		</section>
 
@@ -157,14 +168,7 @@
     	/>
 		</router-view>
 
-	  <component
-			v-if="!MOBILE_APP && route.meta.footer?.component && !route.meta.hideFooter"
-      ref="footer" 
-      :is="route.meta.footer.component"
-      :theme="headerTheme"
-      :logotype="route.meta.footer.logotype"
-      :location="route.meta.footer.location"
-    />
+	
 
     <component 
       v-if="MOBILE_APP && route.meta.title_hide"
@@ -190,7 +194,6 @@
 
 	import NavigationBar from '@martyrs/src/modules/globals/views/components/partials/NavigationBar.vue';
 	import LocationSelection from '@martyrs/src/modules/globals/views/components/partials/LocationSelection.vue';
-	// import Footer from '@martyrs/src/modules/globals/views/components/partials/Footer.vue'
 
 	import ShopCart from '@martyrs/src/modules/orders/components/partials/ShopCart.vue';
 	// PROPS