Update files/constituent-server.js

files/constituent-server.js

@@ -969,8 +969,10 @@ function enqueueToStream(streamId, songInfo) {
   stream.queue.push(songInfo);
   stream.lastActivity = Date.now();
   const position = stream.queue.length;
-  if (!stream.isActive && position === 1 && !stream._showplayInProgress) {
-    // Stream was idle/ended — ensure HLS state is fresh so this song starts at t=0.
+
+  // Start encoding if the stream is idle (no active content).
+  // Showplay items are always appended — they must never evict existing content.
+  if (!stream.isActive && position === 1) {
     if (!hlsState[streamId] || hlsState[streamId].totalDuration > 0) {
       if (hlsState[streamId]) {
         const hlsDir = path.join(HLS_DIR, streamId);
@@ -1057,6 +1059,8 @@ async function showplayEnqueueLink(streamId, pendingLink, pendingTitle, thumbnai
     streams[streamId] = { queue: [], songStartTime: null, streamTimeOffset: 0, users: new Map(), ownerId: streamId, lastActivity: Date.now(), isActive: false };
   }
   streams[streamId]._showplayInProgress = (streams[streamId]._showplayInProgress || 0) + 1;
+  // Keep the stream warm so the inactivity cleanup never evicts it mid-download
+  streams[streamId].lastActivity = Date.now();
 
   // Notify listeners that download is starting
   io.to(`stream:${streamId}`).emit('message', { type: 'showplay_progress', stage: 'downloading', title: pendingTitle });
@@ -1095,8 +1099,6 @@ async function showplayEnqueueLink(streamId, pendingLink, pendingTitle, thumbnai
     throw new Error(`Video too long. Max 6 hours.`);
   }
 
-  if (streams[streamId]) streams[streamId]._showplayInProgress = Math.max(0, (streams[streamId]._showplayInProgress || 1) - 1);
-
   const effectivePoster = tmdbInfo?.poster || thumbnail || DEFAULT_ARTWORK;
   const songInfo = {
     fileName,
@@ -1113,7 +1115,10 @@ async function showplayEnqueueLink(streamId, pendingLink, pendingTitle, thumbnai
     isShowplay: true,
   };
 
+  // Enqueue BEFORE decrementing _showplayInProgress so the cleanup timer
+  // never sees a zero-count window between "file ready" and "item in queue".
   enqueueToStream(streamId, songInfo);
+  if (streams[streamId]) streams[streamId]._showplayInProgress = Math.max(0, (streams[streamId]._showplayInProgress || 1) - 1);
   return { title: songInfo.meta.title, duration: mediaMeta.duration, thumbnail: effectivePoster };
 }
 
@@ -1168,6 +1173,8 @@ setInterval(() => {
   const now = Date.now(), toDelete = [];
   for (const streamId in streams) {
     const stream = streams[streamId];
+    // Never evict a stream that is still actively downloading/encoding media
+    if (stream._showplayInProgress > 0) continue;
     if ((!stream.users || stream.users.size === 0) && (now - (stream.lastActivity || 0)) > STREAM_CLEANUP_INTERVAL) {
       toDelete.push(streamId);
     }