npm - plexsonic - Versions diffs - 0.1.10 → 0.1.11 - Mend

plexsonic 0.1.10 → 0.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "plexsonic",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "PlexMusic to OpenSubsonic bridge",
   "main": "./src/index.js",
   "bin": {

package/src/html.js CHANGED Viewed

@@ -71,6 +71,8 @@ export function pageTemplate({ title, body, notice = '' }) {
       --primary-hover: #1d4ed8;
       --danger: #dc2626;
       --danger-bg: #fef2f2;
+      --success: #059669;
+      --success-bg: #ecfdf5;
       --border: #e5e7eb;
       --font-sans: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
     }
@@ -128,6 +130,12 @@ export function pageTemplate({ title, body, notice = '' }) {
       text-align: center;
     }
+    .notice.success {
+      background: var(--success-bg);
+      color: var(--success);
+      border-color: var(--success);
+    }
     form {
       display: flex;
       flex-direction: column;
@@ -257,6 +265,12 @@ export function pageTemplate({ title, body, notice = '' }) {
       word-break: break-all;
     }
+    .status.success {
+      color: var(--success);
+      background: var(--success-bg);
+      border-color: var(--success);
+    }
     .test-output {
       white-space: pre-wrap;
       overflow: auto;
@@ -279,7 +293,11 @@ export function pageTemplate({ title, body, notice = '' }) {
 </head>
 <body>
   <main>
-    ${notice ? `<div class="notice">${escapeHtml(notice)}</div>` : ''}
+    ${(() => {
+      if (!notice) return '';
+      const isSuccess = /successfully|linked|connected|verified|saved|complete|updated|signed out|unlinked/i.test(notice);
+      return `<div class="notice ${isSuccess ? 'success' : ''}">${escapeHtml(notice)}</div>`;
+    })()}
     ${body}
   </main>
 </body>
@@ -379,7 +397,7 @@ export function linkedPlexPage({
 }) {
   const statusLines = [
     `<p><strong>User:</strong> ${escapeHtml(username)}</p>`,
-    `<p><strong>Plex link:</strong> Connected</p>`,
+    `<p><strong>Plex link:</strong> <span style="color: var(--success); font-weight: 600;">Connected</span></p>`,
     `<p><strong>Server:</strong> ${serverName ? escapeHtml(serverName) : 'Not selected yet'}</p>`,
     `<p><strong>Music library:</strong> ${libraryName ? escapeHtml(libraryName) : 'Not selected yet'}</p>`,
   ].join('');
@@ -479,6 +497,7 @@ export function plexPinPage({ authUrl, sid, phase }) {
           if (!closed) {
             hintEl.textContent = 'Plex linked. You can close this page now.';
             statusEl.textContent = 'Plex authorization completed.';
+            statusEl.classList.add('success');
             manualLinkEl.style.display = 'none';
           }
         }
@@ -489,6 +508,7 @@ export function plexPinPage({ authUrl, sid, phase }) {
             const data = await res.json();
             if (data.status === 'linked') {
               statusEl.textContent = 'Plex linked. Attempting to close...';
+              statusEl.classList.add('success');
               closeOrShowMessage(data.next || '/link/plex/server');
               return;
             }
@@ -629,9 +649,21 @@ export function testPage({ username }) {
               },
             });
             const text = await res.text();
-            out.textContent = formatResponse(text);
+            const formatted = formatResponse(text);
+            out.textContent = formatted;
+            try {
+              const data = JSON.parse(text);
+              if (data?.['subsonic-response']?.status === 'ok') {
+                out.classList.add('success');
+              } else {
+                out.classList.remove('success');
+              }
+            } catch {
+              out.classList.remove('success');
+            }
           } catch (err) {
             out.textContent = 'Request failed: ' + err.message;
+            out.classList.remove('success');
           }
         }

package/src/server.js CHANGED Viewed

@@ -7150,6 +7150,134 @@ export async function buildServer(config = loadConfig()) {
     }
   });
+  app.get('/rest/download.view', async (request, reply) => {
+    const account = await authenticateSubsonicRequest(request, reply, repo, tokenCipher);
+    if (!account) {
+      return;
+    }
+    const trackId = getQueryString(request, 'id');
+    if (!trackId) {
+      return sendSubsonicError(reply, 70, 'Missing track id');
+    }
+    const context = repo.getAccountPlexContext(account.id);
+    const plexState = requiredPlexStateForSubsonic(reply, context, tokenCipher);
+    if (!plexState) {
+      return;
+    }
+    try {
+      const track = await getTrack({
+        baseUrl: plexState.baseUrl,
+        plexToken: plexState.plexToken,
+        trackId,
+      });
+      if (!track) {
+        return sendSubsonicError(reply, 70, 'Track not found');
+      }
+      const part = partFromTrack(track);
+      const partKey = part?.key;
+      if (!partKey) {
+        return sendSubsonicError(reply, 70, 'Track has no downloadable part');
+      }
+      const streamUrl = buildPmsAssetUrl(plexState.baseUrl, plexState.plexToken, partKey);
+      const rangeHeader = request.headers.range;
+      const upstreamController = new AbortController();
+      const abortUpstreamOnDisconnect = () => {
+        if (!upstreamController.signal.aborted) {
+          upstreamController.abort();
+        }
+      };
+      request.raw.once('aborted', abortUpstreamOnDisconnect);
+      request.raw.once('close', abortUpstreamOnDisconnect);
+      reply.raw.once('close', abortUpstreamOnDisconnect);
+      const upstream = await fetchWithRetry({
+        url: streamUrl,
+        options: {
+          headers: {
+            ...(rangeHeader ? { Range: rangeHeader } : {}),
+          },
+          signal: upstreamController.signal,
+        },
+        request,
+        context: 'track download proxy',
+        maxAttempts: 3,
+        baseDelayMs: 250,
+      });
+      if (!upstream.ok || !upstream.body) {
+        request.log.warn({ status: upstream.status }, 'Failed to proxy track download');
+        return sendSubsonicError(reply, 70, 'Track download unavailable');
+      }
+      reply.code(upstream.status);
+      for (const headerName of [
+        'content-type',
+        'content-length',
+        'content-range',
+        'accept-ranges',
+        'etag',
+        'last-modified',
+      ]) {
+        const value = upstream.headers.get(headerName);
+        if (value) {
+          reply.header(headerName, value);
+        }
+      }
+      const fileName = part?.file ? part.file.split(/[/\\]/).pop() : null;
+      if (fileName) {
+        reply.header(
+          'content-disposition',
+          `attachment; filename*=UTF-8''${encodeURIComponent(fileName)}`,
+        );
+      }
+      const proxiedBody = Readable.fromWeb(upstream.body);
+      const responseBody = new PassThrough();
+      proxiedBody.on('error', (streamError) => {
+        if (
+          isAbortError(streamError) ||
+          isUpstreamTerminationError(streamError) ||
+          isClientDisconnected(request, reply)
+        ) {
+          responseBody.end();
+          return;
+        }
+        request.log.warn(streamError, 'Upstream stream error while proxying track download');
+        responseBody.destroy(streamError);
+      });
+      responseBody.on('error', (streamError) => {
+        if (
+          isAbortError(streamError) ||
+          isUpstreamTerminationError(streamError) ||
+          isClientDisconnected(request, reply)
+        ) {
+          return;
+        }
+        request.log.warn(streamError, 'Response stream error while proxying track download');
+      });
+      proxiedBody.pipe(responseBody);
+      return reply.send(responseBody);
+    } catch (error) {
+      if (isAbortError(error) || isUpstreamTerminationError(error) || isClientDisconnected(request, reply)) {
+        return;
+      }
+      request.log.error(error, 'Failed to proxy download');
+      return sendSubsonicError(reply, 10, 'Download proxy failed');
+    }
+  });
   app.get('/rest/stream.view', async (request, reply) => {
     const account = await authenticateSubsonicRequest(request, reply, repo, tokenCipher);
     if (!account) {