@ozdao/martyrs 0.2.550 → 0.2.552

package/src/modules/icons/entities/IconMusic.vue

@@ -1,6 +1,6 @@
 <template>
 <svg width="100pt" height="100pt" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-<path d="m75.102 23.398c0-1.8984-1.8984-3.3008-3.8008-2.8984l-28.199 6.1992c-1.3984 0.30078-2.3984 1.5-2.3984 2.8984v4.8984l34.5-7.5-0.003906-3.5977zm0 9.7031-34.5 7.5v34.5c0 4.8984-3.6992 9.1992-8.8008 10.102h-0.19922c-6.6992 1.3008-12.898-3.6016-12.898-10 0-4.8984 3.6016-9.1016 8.6992-10l7-1.3008v-34.301c0-4.1016 3-7.6992 7.3008-8.6016l28.199-6.1992c5.8984-1.3008 11.5 2.8984 11.5 8.6016v42.699c0 4.8984-3.6992 9.1992-8.8008 10.102h-0.19922c-6.6992 1.3008-12.898-3.6016-12.898-10 0-4.8984 3.6016-9.1016 8.6992-10l7-1.3008-0.003906-21.801zm0 27.898-5.6992 1.1016c-2.1016 0.39844-3.6992 2.1992-3.6992 4.1992 0 2.6992 2.6016 4.6992 5.3984 4.1992h0.19922c2.1992-0.39844 3.8008-2.1992 3.8008-4.3008zm-40.801 8.8984-5.6992 1.1016c-2.1016 0.39844-3.6992 2.1992-3.6992 4.1992 0 2.6992 2.6016 4.6992 5.3984 4.1992h0.19922c2.1992-0.39844 3.8008-2.1992 3.8008-4.3008z" fill-rule="evenodd"/>
+<path d="m75.102 23.398c0-1.8984-1.8984-3.3008-3.8008-2.8984l-28.199 6.1992c-1.3984 0.30078-2.3984 1.5-2.3984 2.8984v4.8984l34.5-7.5-0.003906-3.5977zm0 9.7031-34.5 7.5v34.5c0 4.8984-3.6992 9.1992-8.8008 10.102h-0.19922c-6.6992 1.3008-12.898-3.6016-12.898-10 0-4.8984 3.6016-9.1016 8.6992-10l7-1.3008v-34.301c0-4.1016 3-7.6992 7.3008-8.6016l28.199-6.1992c5.8984-1.3008 11.5 2.8984 11.5 8.6016v42.699c0 4.8984-3.6992 9.1992-8.8008 10.102h-0.19922c-6.6992 1.3008-12.898-3.6016-12.898-10 0-4.8984 3.6016-9.1016 8.6992-10l7-1.3008-0.003906-21.801zm0 27.898-5.6992 1.1016c-2.1016 0.39844-3.6992 2.1992-3.6992 4.1992 0 2.6992 2.6016 4.6992 5.3984 4.1992h0.19922c2.1992-0.39844 3.8008-2.1992 3.8008-4.3008zm-40.801 8.8984-5.6992 1.1016c-2.1016 0.39844-3.6992 2.1992-3.6992 4.1992 0 2.6992 2.6016 4.6992 5.3984 4.1992h0.19922c2.1992-0.39844 3.8008-2.1992 3.8008-4.3008z" :fill="fill" fill-rule="evenodd"/>
 </svg>
 </template>
 

package/src/modules/inventory/components/pages/InventoryEdit.vue

@@ -251,9 +251,10 @@
   import { computed, onMounted, ref, reactive } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
   import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
- 
-  import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+
+  import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+  const core = useStore();
   import * as inventory from '@martyrs/src/modules/inventory/store/inventory.store.js';
   import * as products from '@martyrs/src/modules/products/store/products.js';
   import * as spots from '@martyrs/src/modules/spots/store/spots.js';

package/src/modules/inventory/store/stock.alerts.store.js

@@ -1,5 +1,5 @@
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 
-const stockAlertsStore = new Store('/api/inventory/alerts');
+const stockAlertsStore = new StoreManager('/api/inventory/alerts');
 
 export default stockAlertsStore;

package/src/modules/landing/landing.client.js

@@ -14,7 +14,7 @@ import SectionFeaturesImages from './components/sections/SectionFeaturesImages.v
 import SectionHeroToken from './components/sections/SectionHeroToken.vue';
 import SectionRoadmap from './components/sections/SectionRoadmap.vue';
 
-import { i18nManager } from '@martyrs/src/modules/core/views/classes/core.i18n.js';
+import { i18nManager } from '@martyrs/src/modules/core/views/classes/i18n.manager.js';
 import locales from './locales/index.js';
 
 // Регистрируем локализацию для модуля landing

package/src/modules/marketplace/views/components/layouts/Marketplace.vue

@@ -164,8 +164,9 @@
 	import Checkbox from "@martyrs/src/components/Checkbox/Checkbox.vue"
 	import IconChevronBottom from '@martyrs/src/modules/icons/navigation/IconChevronBottom.vue'
 
-	import * as core from '@martyrs/src/modules/core/views/store/core.store.js'
+	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
   import * as categories from '@martyrs/src/modules/products/store/categories.js';
+	const core = useStore()
 
 
 	import * as marketplace from '../../store/marketplace';

package/src/modules/marketplace/views/components/pages/Catalog.vue

@@ -48,7 +48,8 @@
 	import Feed from '@martyrs/src/components/Feed/Feed.vue'
 	
 	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js'
-	import * as core from '@martyrs/src/modules/core/views/store/core.store.js'
+	import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js'
+	const core = useStore()
 
 	import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'
 

package/src/modules/music/components/cards/TrackListCard.vue

@@ -128,7 +128,7 @@ const playTrack = (track, force = false) => {
 };
 
 const pauseTrack = () => {
-  playerActions.pause();
+  playerActions.togglePlay();
 };
 
 const getArtistName = (track) => {

package/src/modules/music/components/forms/AlbumForm.vue

@@ -246,7 +246,9 @@ import BlockMultiselect from '@martyrs/src/modules/core/views/components/blocks/
 import * as albumsStore from '../../store/albums';
 import * as artistsStore from '../../store/artists';
 import * as genresStore from '../../store/genres';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 
 // Props
@@ -336,7 +338,7 @@ const fetchAlbum = async () => {
     const fetchedAlbum = await albumsStore.actions.fetchAlbumByUrl(props.url);
     
     if (!fetchedAlbum) {
-      core.actions.setError({
+      store.core.actions.setError({
         message: 'Album not found'
       });
       return;
@@ -359,7 +361,7 @@ const fetchAlbum = async () => {
     
   } catch (error) {
     console.error('Error fetching album:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to load album details'
     });
   }
@@ -439,7 +441,7 @@ const submitForm = async () => {
     
   } catch (error) {
     console.error('Error saving album:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to save album'
     });
   }
@@ -447,7 +449,7 @@ const submitForm = async () => {
 
 const handleUploadError = (error) => {
   console.error('Upload error:', error);
-  core.actions.setError({
+  store.core.actions.setError({
     message: 'Error uploading image'
   });
 };
@@ -460,4 +462,4 @@ onMounted(async () => {
     urlManuallySet.value = true;
   }
 });
-</script>
+</script>

package/src/modules/music/components/forms/ArtistForm.vue

@@ -242,7 +242,9 @@ import IconCross from '@martyrs/src/modules/icons/navigation/IconCross.vue';
 // Import store
 import * as artistsStore from '../../store/artists';
 import * as genresStore from '../../store/genres';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 
 // Props
@@ -331,7 +333,7 @@ const fetchArtist = async () => {
     const fetchedArtist = await artistsStore.actions.fetchArtistByUrl(props.url);
     
     if (!fetchedArtist) {
-      core.actions.setError({
+      store.core.actions.setError({
         message: 'Artist not found'
       });
       return;
@@ -360,7 +362,7 @@ const fetchArtist = async () => {
     
   } catch (error) {
     console.error('Error fetching artist:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to load artist details'
     });
   }
@@ -433,7 +435,7 @@ const submitForm = async () => {
     
   } catch (error) {
     console.error('Error saving artist:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to save artist'
     });
   }
@@ -441,7 +443,7 @@ const submitForm = async () => {
 
 const handleUploadError = (error) => {
   console.error('Upload error:', error);
-  core.actions.setError({
+  store.core.actions.setError({
     message: 'Error uploading image'
   });
 };
@@ -454,4 +456,4 @@ onMounted(async () => {
     urlManuallySet.value = true;
   }
 });
-</script>
+</script>

package/src/modules/music/components/forms/PlaylistForm.vue

@@ -247,7 +247,9 @@ import BlockMultiselect from '@martyrs/src/modules/core/views/components/blocks/
 // Import stores
 import * as playlistsStore from '../../store/playlists';
 import * as tracksStore from '../../store/tracks';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 
 // Props
@@ -346,7 +348,7 @@ const fetchPlaylist = async () => {
     const fetchedPlaylist = await playlistsStore.actions.fetchPlaylistByUrl(props.url);
     
     if (!fetchedPlaylist) {
-      core.actions.setError({
+      store.core.actions.setError({
         message: 'Playlist not found'
       });
       return;
@@ -366,7 +368,7 @@ const fetchPlaylist = async () => {
     
   } catch (error) {
     console.error('Error fetching playlist:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to load playlist details'
     });
   }
@@ -442,7 +444,7 @@ const submitForm = async () => {
     
   } catch (error) {
     console.error('Error saving playlist:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to save playlist'
     });
   }
@@ -450,7 +452,7 @@ const submitForm = async () => {
 
 const handleUploadError = (error) => {
   console.error('Upload error:', error);
-  core.actions.setError({
+  store.core.actions.setError({
     message: 'Error uploading image'
   });
 };
@@ -463,4 +465,4 @@ onMounted(async () => {
     urlManuallySet.value = true;
   }
 });
-</script>
+</script>

package/src/modules/music/components/forms/TrackForm.vue

@@ -362,7 +362,9 @@ import * as tracksStore from '../../store/tracks';
 import * as artistsStore from '../../store/artists';
 import * as albumsStore from '../../store/albums';
 import * as genresStore from '../../store/genres';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 
 // Store states and actions
@@ -455,7 +457,7 @@ const fetchTrack = async () => {
     const fetchedTrack = await tracksStore.actions.fetchTrackByUrl(props.url);
     
     if (!fetchedTrack) {
-      core.actions.setError({
+      store.core.actions.setError({
         message: 'Track not found'
       });
       return;
@@ -481,7 +483,7 @@ const fetchTrack = async () => {
     
   } catch (error) {
     console.error('Error fetching track:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to load track details'
     });
   }
@@ -572,14 +574,14 @@ const submitForm = async () => {
     
   } catch (error) {
     console.error('Error saving track:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to save track'
     });
   }
 };
 const handleUploadError = (error) => {
   console.error('Upload error:', error);
-  core.actions.setError({
+  store.core.actions.setError({
     message: 'Error uploading file'
   });
 };
@@ -592,4 +594,4 @@ onMounted(async () => {
     urlManuallySet.value = true;
   }
 });
-</script>
+</script>

package/src/modules/music/components/pages/Artist.vue

@@ -312,7 +312,9 @@ import TrackListCard from '../cards/TrackListCard.vue';
 import * as artistsStore from '../../store/artists';
 // import * as genreStore from '../../store/genres'; // Assuming you have a genre store
 import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 
 // Import mixins
 import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js';
@@ -375,7 +377,7 @@ const fetchArtist = async () => {
     await artistsStore.actions.fetchArtistByUrl(url);
   } catch (error) {
     console.error('Error fetching artist:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to load artist'
     });
   }
@@ -390,4 +392,4 @@ onMounted(async () => {
   hasLoaded.value = true;
   emits('page-loaded');
 });
-</script>
+</script>

package/src/modules/music/components/pages/Playlist.vue

@@ -359,7 +359,9 @@ import { state as playlistsState, actions as playlistsActions } from '../../stor
 import { state as tracksState, actions as tracksActions } from '../../store/tracks.js';
 import { actions as playerActions } from '../../store/player.js';
 import { state as authState } from '@martyrs/src/modules/auth/views/store/auth.js';
-import * as core from '@martyrs/src/modules/core/views/store/core.store.js';
+import { useStore } from '@martyrs/src/modules/core/views/store/core.store.js';
+
+const store = useStore();
 
 const route = useRoute();
 const router = useRouter();
@@ -553,7 +555,7 @@ const confirmDelete = async () => {
     router.push({ name: 'music-library' });
   } catch (error) {
     console.error('Error deleting playlist:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to delete playlist'
     });
   }
@@ -566,7 +568,7 @@ const removeTrack = async (trackId) => {
     await fetchPlaylistData();
   } catch (error) {
     console.error('Error removing track:', error);
-    core.actions.setError({
+    store.core.actions.setError({
       message: 'Failed to remove track'
     });
   }
@@ -621,4 +623,4 @@ onMounted(async () => {
   hasLoaded.value = true;
   emits('page-loaded');
 });
-</script>
+</script>

package/src/modules/music/music.client.js

@@ -44,7 +44,7 @@ import SearchForm from './components/forms/SearchForm.vue';
 import TrackForm from './components/forms/TrackForm.vue';
 
 // WebSocket integration for streaming
-import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
+import wsManager from '@martyrs/src/modules/core/views/classes/ws.manager.js';
 
 /**
  * Initialize Music module on client-side
@@ -71,7 +71,7 @@ function initializeMusic(app, store, router, config, options = {}) {
 
   // Set up WebSocket subscription for music streaming
   if (options.enableStreaming !== false && app.config.globalProperties.WSS_URL) {
-    globalWebSocket.initialize({
+    wsManager.initialize({
       wsUrl: process.env.WSS_URL,
       maxReconnectAttempts: 10,
       reconnectDelay: 2000,
@@ -79,10 +79,10 @@ function initializeMusic(app, store, router, config, options = {}) {
 
     // Subscribe to music streaming module when authenticated
     if (options.userId) {
-      globalWebSocket
+      wsManager
         .connect(options.userId)
         .then(() => {
-          globalWebSocket.subscribeModule('music-streaming');
+          wsManager.subscribeModule('music-streaming');
         })
         .catch(err => {
           console.error('Failed to connect to WebSocket for music streaming:', err);

package/src/modules/music/music.router.js

@@ -1,3 +1,6 @@
+import PlayerMusic from  './components/layouts/MusicBottomPlayer.vue'
+
+
 function createArtistRoutes() {
   return [
     {
@@ -173,7 +176,7 @@ export function getRoutes(options = {}) {
     config: {
       basePath: options.basePath || 'music',
       meta: {
-        player: options.playerComponent || (() => import(/* webpackChunkName: 'music-bottom-player' */ './components/layouts/MusicBottomPlayer.vue')),
+        player: PlayerMusic,
       },
       routes: buildMusicRoutes(options),
     },

package/src/modules/music/store/albums.js

@@ -1,9 +1,9 @@
 // store/albums.js
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 import { reactive } from 'vue';
 
 // Create store instance
-const albumStore = new Store(`${process.env.API_URL}/api/albums`);
+const albumStore = new StoreManager(`${process.env.API_URL}/api/albums`);
 
 // State
 export const state = reactive({

package/src/modules/music/store/artists.js

@@ -1,9 +1,9 @@
 // store/artists.js
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 import { reactive } from 'vue';
 
 // Create store instance
-const artistStore = new Store(`${process.env.API_URL}/api/artists`);
+const artistStore = new StoreManager(`${process.env.API_URL}/api/artists`);
 
 // State
 export const state = reactive({

package/src/modules/music/store/genres.js

@@ -1,9 +1,9 @@
 // store/genres.js
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 import { reactive } from 'vue';
 
 // Create store instance
-const genreStore = new Store(`${process.env.API_URL}/api/genres`);
+const genreStore = new StoreManager(`${process.env.API_URL}/api/genres`);
 
 // State
 export const state = reactive({

package/src/modules/music/store/player.js

@@ -1,5 +1,5 @@
 // store/player.js
-import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
+import wsManager from '@martyrs/src/modules/core/views/classes/ws.manager.js';
 import { reactive } from 'vue';
 
 // State
@@ -98,11 +98,11 @@ export const actions = {
 
     // Log play via WebSocket if connected
     console.log('Player: Attempting to log play event for track:', track._id);
-    console.log('Player: WebSocket connected?', globalWebSocket.isSocketConnected());
+    console.log('Player: WebSocket connected?', wsManager.isSocketConnected());
     
-    if (globalWebSocket.isSocketConnected()) {
+    if (wsManager.isSocketConnected()) {
       console.log('Player: Sending startPlaying event via WebSocket');
-      globalWebSocket.send({
+      wsManager.send({
         module: 'music-streaming',
         action: 'startPlaying',
         data: {
@@ -319,15 +319,15 @@ export const actions = {
   joinListeningParty(partyId) {
     state.listeningPartyId = partyId;
 
-    if (globalWebSocket.isSocketConnected()) {
-      globalWebSocket.send({
+    if (wsManager.isSocketConnected()) {
+      wsManager.send({
         module: 'music-streaming',
         action: 'joinListeningParty',
         data: { partyId },
       });
 
       // Set up event listener for party playback sync
-      globalWebSocket.addEventListener('partyPlaybackSync', this.handlePartySync.bind(this), {
+      wsManager.addEventListener('partyPlaybackSync', this.handlePartySync.bind(this), {
         module: 'music-streaming',
       });
     }
@@ -337,17 +337,17 @@ export const actions = {
     state.listeningPartyId = null;
 
     // Remove event listener for party sync
-    if (globalWebSocket.isSocketConnected()) {
-      globalWebSocket.removeEventListener('partyPlaybackSync');
+    if (wsManager.isSocketConnected()) {
+      wsManager.removeEventListener('partyPlaybackSync');
     }
   },
 
   syncPartyPlayback() {
-    if (!state.listeningPartyId || !state.currentTrack || !globalWebSocket.isSocketConnected()) {
+    if (!state.listeningPartyId || !state.currentTrack || !wsManager.isSocketConnected()) {
       return;
     }
 
-    globalWebSocket.send({
+    wsManager.send({
       module: 'music-streaming',
       action: 'syncPartyPlayback',
       data: {

package/src/modules/music/store/playlists.js

@@ -1,9 +1,9 @@
 // store/playlists.js
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 import { reactive } from 'vue';
 
 // Create store instance
-const playlistStore = new Store(`${process.env.API_URL}/api/playlists`);
+const playlistStore = new StoreManager(`${process.env.API_URL}/api/playlists`);
 
 // State
 export const state = reactive({

package/src/modules/music/store/tracks.js

@@ -1,9 +1,9 @@
 // store/tracks.js
-import Store from '@martyrs/src/modules/core/views/classes/core.store.js';
+import StoreManager from '@martyrs/src/modules/core/views/classes/store.manager.js';
 import { reactive } from 'vue';
 
 // Create store instance
-const trackStore = new Store(`${process.env.API_URL}/api/tracks`);
+const trackStore = new StoreManager(`${process.env.API_URL}/api/tracks`);
 
 // State
 export const state = reactive({

package/src/modules/notifications/components/layouts/NotificationsLayout.vue

@@ -18,7 +18,7 @@
 
 <script setup>
 import { computed, inject, ref, onMounted, onUnmounted } from 'vue';
-import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
+import wsManager from '@martyrs/src/modules/core/views/classes/ws.manager.js';
 
 // Get notification manager from store
 const store = inject('store');
@@ -26,7 +26,7 @@ const store = inject('store');
 const notificationManager = computed(() => store.notificationManager || null);
 
 // Реактивное состояние WebSocket
-const wsConnected = ref(globalWebSocket.isConnected);
+const wsConnected = ref(wsManager.isConnected);
 
 // ID слушателей для очистки
 const openListenerId = ref(null);
@@ -34,25 +34,25 @@ const closeListenerId = ref(null);
 
 onMounted(() => {
   // Подписываемся на события WebSocket
-  openListenerId.value = globalWebSocket.addEventListener('open', () => {
+  openListenerId.value = wsManager.addEventListener('open', () => {
     wsConnected.value = true;
   });
   
-  closeListenerId.value = globalWebSocket.addEventListener('close', () => {
+  closeListenerId.value = wsManager.addEventListener('close', () => {
     wsConnected.value = false;
   });
   
   // Устанавливаем начальное состояние
-  wsConnected.value = globalWebSocket.isConnected;
+  wsConnected.value = wsManager.isConnected;
 });
 
 onUnmounted(() => {
   // Очищаем слушатели
   if (openListenerId.value) {
-    globalWebSocket.removeEventListener('open', openListenerId.value);
+    wsManager.removeEventListener('open', openListenerId.value);
   }
   if (closeListenerId.value) {
-    globalWebSocket.removeEventListener('close', closeListenerId.value);
+    wsManager.removeEventListener('close', closeListenerId.value);
   }
 });
 

package/src/modules/notifications/notifications.client.js

@@ -1,3 +1,7 @@
+// [LOADING 37] Notifications module import started
+performance.mark('loading-37-start');
+console.log('[LOADING 37] Notifications module import started...');
+
 import { toRefs, watch } from 'vue';
 // Router import
 import addRoutes from '@martyrs/src/modules/core/views/router/addRoutes.js';
@@ -5,7 +9,7 @@ import { getRoutes } from './notifications.router.js';
 // Store
 import * as storeNotifications from './store/notifications.store.js';
 // Global WebSocket import
-import globalWebSocket from '@martyrs/src/modules/core/views/classes/core.websocket.js';
+import wsManager from '@martyrs/src/modules/core/views/classes/ws.manager.js';
 // Capacitor Preferences
 import { Preferences } from '@capacitor/preferences';
 // Layouts
@@ -19,6 +23,10 @@ import Notifications from './components/pages/Notifications.vue';
 import NotificationItem from './components/blocks/NotificationItem.vue';
 import NotificationBadge from './components/elements/NotificationBadge.vue';
 
+performance.mark('loading-37-imports-end');
+const importsTime = performance.measure('loading-37-imports', 'loading-37-start', 'loading-37-imports-end');
+console.log(`[LOADING 37] All imports completed in ${importsTime.duration.toFixed(2)}ms`);
+
 /**
  * Capacitor Push Notification handler
  */
@@ -327,19 +335,19 @@ class NotificationManager {
     // Connect WebSocket only for authenticated users
     if (userId) {
       console.log('Connecting to websockets via notifications');
-      globalWebSocket.initialize({
+      wsManager.initialize({
         wsUrl: process.env.WSS_URL,
         maxReconnectAttempts: 10,
         reconnectDelay: 2000,
       });
 
-      await globalWebSocket.connect(userId);
+      await wsManager.connect(userId);
 
-      globalWebSocket.removeModuleListeners('notification');
+      wsManager.removeModuleListeners('notification');
 
-      await globalWebSocket.subscribeModule('notification');
+      await wsManager.subscribeModule('notification');
 
-      globalWebSocket.addEventListener(
+      wsManager.addEventListener(
         'notification',
         data => {
           this.store.notifications.actions.addLocalNotification(data.data);
@@ -366,7 +374,7 @@ class NotificationManager {
   disconnect() {
     if (this.isServer) return;
 
-    globalWebSocket.removeModuleListeners('notification');
+    wsManager.removeModuleListeners('notification');
     this.pushHandler.removeListeners();
     this.initialized = false;
   }
@@ -412,7 +420,7 @@ function initializeNotifications(app, store, router, options = {}) {
 
   // Initialize global WebSocket if needed
   if (options.wsUrl) {
-    globalWebSocket.initialize({ wsUrl: process.env.WSS_URL });
+    wsManager.initialize({ wsUrl: process.env.WSS_URL });
   }
 
   // Create notification manager
@@ -516,4 +524,10 @@ export {
   SSRUtils,
 };
 
+// [LOADING 37] Notifications module import completed
+performance.mark('loading-37-end');
+performance.measure('loading-37-total', 'loading-37-start', 'loading-37-end');
+const totalTime = performance.getEntriesByName('loading-37-total')[0];
+console.log(`[LOADING 37] Notifications module fully imported in ${totalTime?.duration?.toFixed(2)}ms`);
+
 export default ModuleNotifications;