@ozdao/martyrs 0.2.492 → 0.2.493

package/src/modules/music/components/player/VolumeControl.vue

@@ -1,27 +1,30 @@
 <!-- components/player/VolumeControl.vue -->
 <template>
-  <div 
-    ref="volumeBarContainer"
-    class="volume-bar-container w-100 h-thin bg-grey-transp-50 radius-extra pos-relative cursor-pointer"
-    @click="setVolume"
-    @mousedown="startVolumeChange"
-    @mousemove="updateVolumePosition"
-    @mouseup="endVolumeChange"
-    @mouseleave="endVolumeChange"
-  >
+  <div class="volume-control">
     <div 
-      class="volume-bar h-100 bg-white radius-extra" 
-      :style="{ width: volumePercentage + '%' }"
-      :class="{ 'muted': muted }"
-    ></div>
-    <div 
-      class="volume-handle w-thin h-thin bg-white radius-round pos-absolute pos-t-50 pos-l-0"
-      :style="{ 
-        left: `calc(${volumePercentage}% - 4px)`, 
-        transform: 'translateY(-50%)',
-        opacity: muted ? 0 : 1
-      }"
-    ></div>
+      ref="volumeBarContainer"
+      class="volume-bar-container"
+      @click="setVolume"
+      @mousedown="startVolumeChange"
+      @mousemove="updateVolumePosition"
+      @mouseup="endVolumeChange"
+      @mouseleave="endVolumeChange"
+    >
+      <div 
+        class="volume-track"
+        :style="{ 
+          background: `linear-gradient(to right, rgb(var(--main)) 0%, rgb(var(--main)) ${volumePercentage}%, rgb(79, 79, 79) ${volumePercentage}%, rgb(79, 79, 79) 100%)`
+        }"
+      >
+        <div 
+          class="volume-thumb"
+          :style="{ 
+            left: `${volumePercentage}%`,
+            opacity: muted ? 0 : 1
+          }"
+        ></div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -80,19 +83,49 @@ const endVolumeChange = () => {
 </script>
 
 <style scoped>
-.volume-bar-container:hover .volume-bar:not(.muted) {
-  background-color: rgb(var(--main));
+.volume-control {
+  width: 100%;
+}
+
+.volume-bar-container {
+  width: 100%;
+  height: 12px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  padding: 4px 0;
+}
+
+.volume-track {
+  position: relative;
+  width: 100%;
+  height: 4px;
+  border-radius: 2px;
+  transition: height 0.2s ease;
+}
+
+.volume-thumb {
+  position: absolute;
+  top: 50%;
+  width: 12px;
+  height: 12px;
+  background: rgb(var(--white));
+  border-radius: 50%;
+  transform: translate(-50%, -50%);
+  transition: opacity 0.2s ease;
+  opacity: 0;
 }
 
-.volume-handle {
-  display: none;
+.volume-bar-container:hover .volume-track {
+  height: 6px;
 }
 
-.volume-bar-container:hover .volume-handle {
-  display: block;
+.volume-bar-container:hover .volume-thumb {
+  opacity: 1 !important;
 }
 
-.muted {
+/* Muted state */
+.volume-track.muted {
   opacity: 0.5;
 }
 </style>

package/src/modules/music/controllers/search.controller.js

@@ -28,6 +28,9 @@ export default (function (app, db) {
               status: 'published',
               isPublic: true,
             })
+            .populate('artist', 'name url photoUrl isVerified')
+            .populate('album', 'title url coverArt')
+            .populate('genre', 'name url')
             .limit(limitNum);
         }
         if (types.includes('albums') || types.includes('all')) {

package/src/modules/music/controllers/stream.controller.js

@@ -30,7 +30,6 @@ export default (function (app, db, publicPath) {
       }
       // Extract file path from fileUrl
       const fileUrl = track.fileUrl;
-      console.log('public is', publicPath);
       const filePath = path.join(publicPath, fileUrl);
       // Check if file exists
       if (!fs.existsSync(filePath)) {
@@ -41,7 +40,10 @@ export default (function (app, db, publicPath) {
       const stat = fs.statSync(filePath);
       const fileSize = stat.size;
       const range = req.headers.range;
-      // Log play history if user is authenticated
+      
+      // Only count play on first request (not range requests)
+      const isFirstRequest = !range || range === 'bytes=0-';
+      
       if (req.userId) {
         try {
           await db.playHistory.create({
@@ -53,10 +55,16 @@ export default (function (app, db, publicPath) {
             contextId: req.query.contextId || null,
           });
           // Increment playCount
-          await db.track.findByIdAndUpdate(trackId, { $inc: { playCount: 1 } });
+          const updatedTrack = await db.track.findByIdAndUpdate(trackId, { $inc: { playCount: 1 } }, { new: true });
         } catch (error) {
           logger.error(`Error logging play history: ${error.message}`);
         }
+      } else {
+        try {
+          const updatedTrack = await db.track.findByIdAndUpdate(trackId, { $inc: { playCount: 1 } }, { new: true });
+        } catch (error) {
+          logger.error(`Error incrementing playCount: ${error.message}`);
+        }
       }
       // Handle range requests for audio streaming
       if (range) {

package/src/modules/music/middlewares/playlists.verifier.js

@@ -167,7 +167,7 @@ export default function(db) {
       rule: 'optional',
       validator: Validator.schema()
         .string()
-        .oneOf(['draft', 'published', 'archived'])
+        .oneOf(['draft', 'published', 'archived', 'featured'])
     },
     skip: {
       rule: 'optional',

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

@@ -11,7 +11,7 @@ import * as storeTracks from './store/tracks.js';
 import routerMusic from './router/music.js';
 
 // Layouts
-import MusicLayout from './components/layouts/MusicLayout.vue';
+import MusicBottomPlayer from './components/layouts/MusicBottomPlayer.vue';
 
 // Pages
 import Album from './components/pages/Album.vue';
@@ -32,7 +32,6 @@ import VolumeControl from './components/player/VolumeControl.vue';
 import AlbumCard from './components/cards/AlbumCard.vue';
 import ArtistCard from './components/cards/ArtistCard.vue';
 import PlaylistCard from './components/cards/PlaylistCard.vue';
-import TrackCard from './components/cards/TrackCard.vue';
 import TrackListCard from './components/cards/TrackListCard.vue';
 
 
@@ -112,7 +111,7 @@ const ModuleMusic = {
     },
     components: {
       // Layouts
-      MusicLayout,
+      MusicBottomPlayer,
       // Pages
       MusicHome,
       SearchResults,
@@ -127,7 +126,6 @@ const ModuleMusic = {
       TrackProgress,
       VolumeControl,
       // Cards
-      TrackCard,
       TrackListCard,
       AlbumCard,
       PlaylistCard,
@@ -151,7 +149,7 @@ export {
   // Pages
   MusicHome,
   // Layout
-  MusicLayout,
+  MusicBottomPlayer,
   MusicLibrary,
   // Player Components
   MusicPlayer,
@@ -165,7 +163,6 @@ export {
   SearchForm,
   SearchResults,
   // Cards
-  TrackCard,
   TrackListCard,
   Track,
   TrackForm,

package/src/modules/music/music.server.js

@@ -63,10 +63,14 @@ function initializeMusic({ app, db, wss, origins, publicPath }) {
   const { getInstance } = globalsabac;
   const abac = getInstance(db);
   musicPolicies(abac);
-  // Set up WebSocket handlers if WebSocketManager is available
-  const { WebSocketManager } = globalswebsocket;
-  if (global.webSocketManager && global.webSocketManager instanceof WebSocketManager) {
-    global.webSocketManager.registerModule('music-streaming', StreamingHandler(db).handleStreamingMessage);
+  // Set up WebSocket handlers if wss is provided
+  if (wss) {
+    console.log('Music Server: Registering music-streaming WebSocket handler');
+    const handler = StreamingHandler(db);
+    wss.registerModule('music-streaming', handler.handleStreamingMessage);
+    console.log('Music Server: WebSocket handler registered successfully');
+  } else {
+    console.log('Music Server: WebSocket server (wss) not provided, streaming handler not registered');
   }
   const musicCache = new Cache({ ttlSeconds: 60 * 15 }); // 15 minute cache
   const musicLogger = new Logger(db);

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

@@ -1,3 +1,7 @@
+import SidebarMusic from '../components/SidebarMusic.vue';
+import MusicBottomPlayer from '../components/layouts/MusicBottomPlayer.vue';
+
+
 // router/music.js
 import artistRoutes from './artists.js';
 import albumRoutes from './albums.js';
@@ -6,7 +10,10 @@ import playlistRoutes from './playlists.js';
 
 export default {
   path: 'music',
-  component: () => import('../components/layouts/MusicLayout.vue'),
+  meta: {
+    // sidebar_navigation: SidebarMusic,
+     player: MusicBottomPlayer, 
+  },
   children: [
     {
       path: '',

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

@@ -17,7 +17,7 @@ export default function setupAlbumsRoutes(app, db) {
     modelName: 'album',
     basePath: '/api/albums',
     
-    auth: true,
+    auth: { read: false },
     
     verifiers: {
       create: verifier.createVerifier,
@@ -28,6 +28,10 @@ export default function setupAlbumsRoutes(app, db) {
     
     abac: abac,
     
+    policies: {
+      read: { enabled: false }
+    },
+    
     cache: {
       enabled: true,
       ttl: 300,
@@ -47,15 +51,27 @@ export default function setupAlbumsRoutes(app, db) {
     method: 'get',
     path: '/url/:url',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const album = await db.album
           .findOne({ url: req.params.url })
-          .populate('artists', 'name url');
+          .populate('artists', 'name url photoUrl isVerified');
         
         if (!album) {
           return res.status(404).json({ error: 'Album not found' });
         }
+
+        // Update totalTracks count if needed
+        const trackCount = await db.track.countDocuments({ 
+          album: album._id,
+          status: 'published'
+        });
+        
+        if (album.totalTracks !== trackCount) {
+          album.totalTracks = trackCount;
+          await album.save();
+        }
         
         res.json(album);
       } catch (error) {
@@ -70,6 +86,7 @@ export default function setupAlbumsRoutes(app, db) {
     method: 'get',
     path: '/:albumId/tracks',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const { albumId } = req.params;
@@ -80,8 +97,9 @@ export default function setupAlbumsRoutes(app, db) {
             status: 'published',
             isPublic: true
           })
-          .populate('artist', 'name url')
-          .populate('genre', 'name')
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
+          .populate('genre', 'name url')
           .sort({ trackNumber: 1, createdAt: 1 });
         
         res.json(tracks);
@@ -97,6 +115,7 @@ export default function setupAlbumsRoutes(app, db) {
     method: 'get',
     path: '/featured',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const limit = parseInt(req.query.limit) || 10;
@@ -110,9 +129,22 @@ export default function setupAlbumsRoutes(app, db) {
               $gte: new Date(Date.now() - 90 * 24 * 60 * 60 * 1000) // последние 90 дней
             }
           })
-          .populate('artists', 'name url')
+          .populate('artists', 'name url photoUrl isVerified')
           .sort({ createdAt: -1 })
           .limit(limit);
+
+        // Update totalTracks count for each album
+        for (const album of featuredAlbums) {
+          const trackCount = await db.track.countDocuments({ 
+            album: album._id,
+            status: 'published'
+          });
+          
+          if (album.totalTracks !== trackCount) {
+            album.totalTracks = trackCount;
+            await album.save();
+          }
+        }
         
         res.json(featuredAlbums);
       } catch (error) {

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

@@ -17,7 +17,7 @@ export default function setupArtistsRoutes(app, db) {
     modelName: 'artist',
     basePath: '/api/artists',
     
-    auth: true,
+    auth: { read: false },
     
     verifiers: {
       create: verifier.createVerifier,
@@ -28,6 +28,10 @@ export default function setupArtistsRoutes(app, db) {
     
     abac: abac,
     
+    policies: {
+      read: { enabled: false }
+    },
+    
     cache: {
       enabled: true,
       ttl: 300,
@@ -47,6 +51,7 @@ export default function setupArtistsRoutes(app, db) {
     method: 'get',
     path: '/url/:url',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const artist = await db.artist.findOne({ url: req.params.url });
@@ -66,6 +71,7 @@ export default function setupArtistsRoutes(app, db) {
     method: 'get',
     path: '/:artistId/discography',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const { artistId } = req.params;
@@ -76,19 +82,22 @@ export default function setupArtistsRoutes(app, db) {
           .populate('artists', 'name')
           .sort({ releaseDate: -1 });
         
-        // Получаем треки артиста (включая те, которые не в альбомах)
+        // Получаем популярные треки артиста (включая те, которые не в альбомах)
         const tracks = await db.track
           .find({ 
             artist: artistId,
             status: 'published',
             isPublic: true 
           })
-          .populate('album', 'title')
-          .sort({ releaseDate: -1 });
+          .populate('album', 'title url coverArt')
+          .populate('genre', 'name')
+          .sort({ playCount: -1 })
+          .limit(10);
         
         res.json({
           albums,
           tracks,
+          singles: tracks.filter(track => !track.album), // треки без альбома считаем синглами
           artist: artistId
         });
       } catch (error) {
@@ -138,6 +147,7 @@ export default function setupArtistsRoutes(app, db) {
     method: 'get',
     path: '/:artistId/related',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const { artistId } = req.params;

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

@@ -17,7 +17,7 @@ export default function setupGenresRoutes(app, db) {
     modelName: 'genre',
     basePath: '/api/genres',
     
-    auth: true,
+    auth: { read: false },
     
     verifiers: {
       create: verifier.createVerifier,
@@ -28,6 +28,10 @@ export default function setupGenresRoutes(app, db) {
     
     abac: abac,
     
+    policies: {
+      read: { enabled: false }
+    },
+    
     cache: {
       enabled: true,
       ttl: 300,

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

@@ -17,7 +17,7 @@ export default function setupPlaylistsRoutes(app, db) {
     modelName: 'playlist',
     basePath: '/api/playlists',
     
-    auth: true,
+    auth: { read: false },
     
     verifiers: {
       create: verifier.createVerifier,
@@ -28,6 +28,10 @@ export default function setupPlaylistsRoutes(app, db) {
     
     abac: abac,
     
+    policies: {
+      read: { enabled: false }
+    },
+    
     cache: {
       enabled: true,
       ttl: 300,
@@ -47,6 +51,7 @@ export default function setupPlaylistsRoutes(app, db) {
     method: 'get',
     path: '/url/:url',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const playlist = await db.playlist
@@ -54,23 +59,38 @@ export default function setupPlaylistsRoutes(app, db) {
           .populate({
             path: 'tracks.track',
             select: '-lyrics',
+            populate: [
+              {
+                path: 'artist',
+                select: 'name url photoUrl isVerified'
+              },
+              {
+                path: 'album', 
+                select: 'title url coverArt'
+              },
+              {
+                path: 'genre',
+                select: 'name url'
+              }
+            ]
           });
         
         if (!playlist) {
           return res.status(404).json({ error: 'Playlist not found' });
         }
         
-        // If not public, check permissions
-        if (!playlist.isPublic) {
-          if (!req.userId) {
-            return res.status(403).json({ error: 'Access denied to private playlist' });
-          }
-          
+        // Only return public playlists if no auth
+        if (!playlist.isPublic && !req.userId) {
+          return res.status(404).json({ error: 'Playlist not found' });
+        }
+        
+        // If private and authenticated, check permissions
+        if (!playlist.isPublic && req.userId) {
           const isOwner = playlist.owner.target.toString() === req.userId;
           const isCollaborator = playlist.collaborators.some(collab => collab.toString() === req.userId);
           
           if (!isOwner && !isCollaborator) {
-            return res.status(403).json({ error: 'Access denied to private playlist' });
+            return res.status(404).json({ error: 'Playlist not found' });
           }
         }
         
@@ -99,7 +119,20 @@ export default function setupPlaylistsRoutes(app, db) {
         
         const playlists = await db.playlist
           .find(query)
-          .populate('tracks.track', 'title artist')
+          .populate({
+            path: 'tracks.track',
+            select: 'title artist album genre duration',
+            populate: [
+              {
+                path: 'artist',
+                select: 'name url photoUrl isVerified'
+              },
+              {
+                path: 'album', 
+                select: 'title url coverArt'
+              }
+            ]
+          })
           .sort({ updatedAt: -1 });
         
         res.json(playlists);

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

@@ -17,7 +17,7 @@ export default function setupTracksRoutes(app, db) {
     modelName: 'track',
     basePath: '/api/tracks',
     
-    auth: true,
+    auth: { read: false },
     
     verifiers: {
       create: verifier.createVerifier,
@@ -28,6 +28,10 @@ export default function setupTracksRoutes(app, db) {
     
     abac: abac,
     
+    policies: {
+      read: { enabled: false }
+    },
+    
     cache: {
       enabled: true,
       ttl: 300,
@@ -40,6 +44,12 @@ export default function setupTracksRoutes(app, db) {
     }
   });
 
+  // Отключаем ABAC для кастомных действий
+  tracksCRUD.policies.disableForAction('get-by-url');
+  tracksCRUD.policies.disableForAction('recent');
+  tracksCRUD.policies.disableForAction('popular');
+  tracksCRUD.policies.disableForAction('by-genre');
+
   // Перенос кастомных роутов через addAction для обратной совместимости
 
   // Get track by URL - /api/tracks/url/:url
@@ -47,9 +57,15 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/url/:url',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
-        const track = await db.track.findOne({ url: req.params.url });
+        const track = await db.track
+          .findOne({ url: req.params.url })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
+          .populate('genre', 'name url');
+        
         if (!track) {
           return res.status(404).json({ error: 'Track not found' });
         }
@@ -82,6 +98,7 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/recent',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const limit = parseInt(req.query.limit) || 10;
@@ -90,6 +107,8 @@ export default function setupTracksRoutes(app, db) {
             status: 'published',
             isPublic: true,
           })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
           .sort({ createdAt: -1 })
           .limit(limit);
         res.json(recentTracks);
@@ -105,6 +124,7 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/popular',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const limit = parseInt(req.query.limit) || 10;
@@ -113,6 +133,8 @@ export default function setupTracksRoutes(app, db) {
             status: 'published',
             isPublic: true,
           })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
           .sort({ playCount: -1 })
           .limit(limit);
         res.json(popularTracks);
@@ -128,6 +150,7 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/genre/:genreId',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const tracks = await db.track
@@ -136,6 +159,8 @@ export default function setupTracksRoutes(app, db) {
             status: 'published',
             isPublic: true,
           })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
           .sort({ releaseDate: -1 });
         res.json(tracks);
       } catch (error) {

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

@@ -14,6 +14,7 @@ export const state = reactive({
   discography: {
     albums: [],
     singles: [],
+    tracks: [],
   },
   relatedArtists: [],
   isLoading: false,
@@ -72,7 +73,6 @@ export const actions = {
     try {
       const response = await fetch(`${process.env.API_URL}/api/artists/url/${url}`);
       const artist = await response.json();
-      state.currentArtist = artist;
 
       // Fetch artist discography
       await this.fetchArtistDiscography(artist._id);
@@ -80,6 +80,9 @@ export const actions = {
       // Fetch related artists
       await this.fetchRelatedArtists(artist._id);
 
+      // Set artist only after all data is loaded
+      state.currentArtist = artist;
+
       return artist;
     } catch (error) {
       console.error('Error fetching artist by URL:', error);
@@ -94,11 +97,12 @@ export const actions = {
       state.discography = {
         albums: discography.albums || [],
         singles: discography.singles || [],
+        tracks: discography.tracks || [],
       };
       return discography;
     } catch (error) {
       console.error('Error fetching artist discography:', error);
-      return { albums: [], singles: [] };
+      return { albums: [], singles: [], tracks: [] };
     }
   },