@ozdao/martyrs 0.2.491 → 0.2.493

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-YBlKbx0g.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-CJm5myDI.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/music.server.cjs

@@ -2,10 +2,12 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const globals_abac = require("./globals.abac-CPXLas7N.cjs");
 const globals_logger = require("./globals.logger-CZMgIMlM.cjs");
-const globals_websocket = require("./globals.websocket-k6_B1T7k.cjs");
-const crud = require("./crud-B-kQw3Z5.cjs");
+require("cookie");
+require("jsonwebtoken");
+require("uWebSockets.js");
+const crud = require("./crud-JN_LFj01.cjs");
 const abac = require("./abac-6LjoG9u-.cjs");
-const globals_verifier = require("./globals.verifier-D68mHEBl.cjs");
+const globals_verifier = require("./globals.verifier-C0zj_LLo.cjs");
 const fs$1 = require("fs");
 const path$1 = require("path");
 const common_schema = require("./common.schema-BzFEVNn3.cjs");
@@ -29,11 +31,11 @@ function tracksVerifierFactory(db) {
     },
     fileUrl: {
       rule: "required",
-      validator: globals_verifier.Validator.schema().string().required("File URL is required").pattern(/^https?:\/\/.+/, "Invalid file URL format")
+      validator: globals_verifier.Validator.schema().string().required("File URL is required").pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     coverUrl: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid cover URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     duration: {
       rule: "optional",
@@ -91,16 +93,19 @@ function tracksVerifierFactory(db) {
     },
     fileUrl: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid file URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     coverUrl: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid cover URL format")
-    },
-    duration: {
-      rule: "optional",
-      validator: globals_verifier.Validator.schema().number().min(0, "Duration cannot be negative").max(3600, "Duration cannot exceed 1 hour")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
+    // duration: {
+    //   rule: 'optional',
+    //   validator: Validator.schema()
+    //     .number()
+    //     .min(0, 'Duration cannot be negative')
+    //     .max(3600, 'Duration cannot exceed 1 hour')
+    // },
     genre: {
       rule: "optional",
       validator: globals_verifier.Validator.schema().array().items(
@@ -196,7 +201,7 @@ function setupTracksRoutes(app, db) {
     model: db.track,
     modelName: "track",
     basePath: "/api/tracks",
-    auth: true,
+    auth: { read: false },
     verifiers: {
       create: verifier.createVerifier,
       read: verifier.readVerifier,
@@ -204,6 +209,9 @@ function setupTracksRoutes(app, db) {
       delete: verifier.deleteVerifier
     },
     abac: abac2,
+    policies: {
+      read: { enabled: false }
+    },
     cache: {
       enabled: true,
       ttl: 300,
@@ -214,13 +222,18 @@ function setupTracksRoutes(app, db) {
       logReads: false
     }
   });
+  tracksCRUD.policies.disableForAction("get-by-url");
+  tracksCRUD.policies.disableForAction("recent");
+  tracksCRUD.policies.disableForAction("popular");
+  tracksCRUD.policies.disableForAction("by-genre");
   tracksCRUD.addAction("get-by-url", {
     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" });
         }
@@ -247,13 +260,14 @@ 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;
         const recentTracks = await db.track.find({
           status: "published",
           isPublic: true
-        }).sort({ createdAt: -1 }).limit(limit);
+        }).populate("artist", "name url photoUrl isVerified").populate("album", "title url coverArt").sort({ createdAt: -1 }).limit(limit);
         res.json(recentTracks);
       } catch (error) {
         console.error(error);
@@ -265,13 +279,14 @@ 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;
         const popularTracks = await db.track.find({
           status: "published",
           isPublic: true
-        }).sort({ playCount: -1 }).limit(limit);
+        }).populate("artist", "name url photoUrl isVerified").populate("album", "title url coverArt").sort({ playCount: -1 }).limit(limit);
         res.json(popularTracks);
       } catch (error) {
         console.error(error);
@@ -283,13 +298,14 @@ function setupTracksRoutes(app, db) {
     method: "get",
     path: "/genre/:genreId",
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const tracks = await db.track.find({
           genre: req.params.genreId,
           status: "published",
           isPublic: true
-        }).sort({ releaseDate: -1 });
+        }).populate("artist", "name url photoUrl isVerified").populate("album", "title url coverArt").sort({ releaseDate: -1 });
         res.json(tracks);
       } catch (error) {
         console.error(error);
@@ -354,11 +370,11 @@ function artistsVerifierFactory(db) {
     },
     photoUrl: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid photo URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     coverUrl: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid cover URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     genre: {
       rule: "optional",
@@ -447,7 +463,7 @@ function setupArtistsRoutes(app, db) {
     model: db.artist,
     modelName: "artist",
     basePath: "/api/artists",
-    auth: true,
+    auth: { read: false },
     verifiers: {
       create: verifier.createVerifier,
       read: verifier.readVerifier,
@@ -455,6 +471,9 @@ function setupArtistsRoutes(app, db) {
       delete: verifier.deleteVerifier
     },
     abac: abac2,
+    policies: {
+      read: { enabled: false }
+    },
     cache: {
       enabled: true,
       ttl: 300,
@@ -469,6 +488,7 @@ 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 });
@@ -486,6 +506,7 @@ function setupArtistsRoutes(app, db) {
     method: "get",
     path: "/:artistId/discography",
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const { artistId } = req.params;
@@ -494,10 +515,12 @@ function setupArtistsRoutes(app, db) {
           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) {
@@ -540,6 +563,7 @@ function setupArtistsRoutes(app, db) {
     method: "get",
     path: "/:artistId/related",
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const { artistId } = req.params;
@@ -580,7 +604,7 @@ function albumsVerifierFactory(db) {
     },
     coverArt: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid cover art URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     artists: {
       rule: "required",
@@ -631,7 +655,7 @@ function albumsVerifierFactory(db) {
     },
     coverArt: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid cover art URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     artists: {
       rule: "optional",
@@ -722,7 +746,7 @@ function setupAlbumsRoutes(app, db) {
     model: db.album,
     modelName: "album",
     basePath: "/api/albums",
-    auth: true,
+    auth: { read: false },
     verifiers: {
       create: verifier.createVerifier,
       read: verifier.readVerifier,
@@ -730,6 +754,9 @@ function setupAlbumsRoutes(app, db) {
       delete: verifier.deleteVerifier
     },
     abac: abac2,
+    policies: {
+      read: { enabled: false }
+    },
     cache: {
       enabled: true,
       ttl: 300,
@@ -744,12 +771,21 @@ 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");
+        const album = await db.album.findOne({ url: req.params.url }).populate("artists", "name url photoUrl isVerified");
         if (!album) {
           return res.status(404).json({ error: "Album not found" });
         }
+        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) {
         console.error(error);
@@ -761,6 +797,7 @@ function setupAlbumsRoutes(app, db) {
     method: "get",
     path: "/:albumId/tracks",
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const { albumId } = req.params;
@@ -768,7 +805,7 @@ function setupAlbumsRoutes(app, db) {
           album: albumId,
           status: "published",
           isPublic: true
-        }).populate("artist", "name url").populate("genre", "name").sort({ trackNumber: 1, createdAt: 1 });
+        }).populate("artist", "name url photoUrl isVerified").populate("album", "title url coverArt").populate("genre", "name url").sort({ trackNumber: 1, createdAt: 1 });
         res.json(tracks);
       } catch (error) {
         console.error(error);
@@ -780,6 +817,7 @@ 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;
@@ -789,7 +827,17 @@ function setupAlbumsRoutes(app, db) {
             $gte: new Date(Date.now() - 90 * 24 * 60 * 60 * 1e3)
             // последние 90 дней
           }
-        }).populate("artists", "name url").sort({ createdAt: -1 }).limit(limit);
+        }).populate("artists", "name url photoUrl isVerified").sort({ createdAt: -1 }).limit(limit);
+        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) {
         console.error(error);
@@ -811,7 +859,7 @@ function playlistsVerifierFactory(db) {
     },
     coverUrl: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().pattern(/^https?:\/\/.+/, "Invalid cover URL format")
+      validator: globals_verifier.Validator.schema().string().pattern(/^\/(?!\/)/, 'Only relative URLs starting with "/" are allowed')
     },
     tracks: {
       rule: "optional",
@@ -910,7 +958,7 @@ function playlistsVerifierFactory(db) {
     },
     status: {
       rule: "optional",
-      validator: globals_verifier.Validator.schema().string().oneOf(["draft", "published", "archived"])
+      validator: globals_verifier.Validator.schema().string().oneOf(["draft", "published", "archived", "featured"])
     },
     skip: {
       rule: "optional",
@@ -955,7 +1003,7 @@ function setupPlaylistsRoutes(app, db) {
     model: db.playlist,
     modelName: "playlist",
     basePath: "/api/playlists",
-    auth: true,
+    auth: { read: false },
     verifiers: {
       create: verifier.createVerifier,
       read: verifier.readVerifier,
@@ -963,6 +1011,9 @@ function setupPlaylistsRoutes(app, db) {
       delete: verifier.deleteVerifier
     },
     abac: abac2,
+    policies: {
+      read: { enabled: false }
+    },
     cache: {
       enabled: true,
       ttl: 300,
@@ -977,23 +1028,38 @@ function setupPlaylistsRoutes(app, db) {
     method: "get",
     path: "/url/:url",
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const playlist = await db.playlist.findOne({ url: req.params.url }).populate({
           path: "tracks.track",
-          select: "-lyrics"
+          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 (!playlist.isPublic) {
-          if (!req.userId) {
-            return res.status(403).json({ error: "Access denied to private playlist" });
-          }
+        if (!playlist.isPublic && !req.userId) {
+          return res.status(404).json({ error: "Playlist not found" });
+        }
+        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" });
           }
         }
         res.json(playlist);
@@ -1014,7 +1080,20 @@ function setupPlaylistsRoutes(app, db) {
         if (userId !== req.userId) {
           query.isPublic = true;
         }
-        const playlists = await db.playlist.find(query).populate("tracks.track", "title artist").sort({ updatedAt: -1 });
+        const playlists = await db.playlist.find(query).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);
       } catch (error) {
         console.error(error);
@@ -1224,7 +1303,7 @@ function setupGenresRoutes(app, db) {
     model: db.genre,
     modelName: "genre",
     basePath: "/api/genres",
-    auth: true,
+    auth: { read: false },
     verifiers: {
       create: verifier.createVerifier,
       read: verifier.readVerifier,
@@ -1232,6 +1311,9 @@ function setupGenresRoutes(app, db) {
       delete: verifier.deleteVerifier
     },
     abac: abac2,
+    policies: {
+      read: { enabled: false }
+    },
     cache: {
       enabled: true,
       ttl: 300,
@@ -1318,7 +1400,7 @@ const SearchController = function(app, db) {
             $or: [{ title: searchRegex }, { tags: searchRegex }],
             status: "published",
             isPublic: true
-          }).limit(limitNum);
+          }).populate("artist", "name url photoUrl isVerified").populate("album", "title url coverArt").populate("genre", "name url").limit(limitNum);
         }
         if (types.includes("albums") || types.includes("all")) {
           results.albums = await db.album.find({
@@ -1381,7 +1463,6 @@ const StreamController = function(app, db, publicPath) {
         });
       }
       const fileUrl = track.fileUrl;
-      console.log("public is", publicPath);
       const filePath = path$1.join(publicPath, fileUrl);
       if (!fs$1.existsSync(filePath)) {
         logger.error(`File not found: ${filePath}`);
@@ -1390,6 +1471,7 @@ const StreamController = function(app, db, publicPath) {
       const stat = fs$1.statSync(filePath);
       const fileSize = stat.size;
       const range = req.headers.range;
+      const isFirstRequest = !range || range === "bytes=0-";
       if (req.userId) {
         try {
           await db.playHistory.create({
@@ -1400,10 +1482,16 @@ const StreamController = function(app, db, publicPath) {
             playedFrom: req.query.from || "other",
             contextId: req.query.contextId || null
           });
-          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}`);
+        }
       }
       if (range) {
         const parts = range.replace(/bytes=/, "").split("-");
@@ -1855,9 +1943,11 @@ const StreamingHandler = function(db) {
     // Handle WebSocket messages for music streaming
     handleStreamingMessage: async (ws, message) => {
       try {
+        console.log("StreamingHandler: Received message:", { action: message.action, data: message.data });
         const { action, data } = message;
         switch (action) {
           case "startPlaying":
+            console.log("StreamingHandler: Processing startPlaying event for track:", data.trackId, "user:", ws.userId);
             if (ws.userId && data.trackId) {
               await db.playHistory.create({
                 user: ws.userId,
@@ -1867,7 +1957,9 @@ const StreamingHandler = function(db) {
                 playedFrom: data.from || "other",
                 contextId: data.contextId || null
               });
-              await db.track.findByIdAndUpdate(data.trackId, { $inc: { playCount: 1 } });
+              console.log("StreamingHandler: Created play history record");
+              const trackUpdate = await db.track.findByIdAndUpdate(data.trackId, { $inc: { playCount: 1 } }, { new: true });
+              console.log("StreamingHandler: Updated track playCount to:", trackUpdate?.playCount);
               ws.send(
                 JSON.stringify({
                   type: "playAcknowledged",
@@ -1976,9 +2068,13 @@ function initializeMusic({ app, db, wss, origins, publicPath }) {
   const { getInstance: getInstance2 } = globals_abac.globalsabac;
   const abac2 = getInstance2(db);
   musicPolicies(abac2);
-  const { WebSocketManager } = globals_websocket.WebSocketManager;
-  if (global.webSocketManager && global.webSocketManager instanceof WebSocketManager) {
-    global.webSocketManager.registerModule("music-streaming", StreamingHandler(db).handleStreamingMessage);
+  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");
   }
   new globals_logger.Cache({ ttlSeconds: 60 * 15 });
   const musicLogger = new globals_logger.Logger(db);