fix: align legacy playlist handling with new client

Author: rudyberends

src/backend/provider/musicAssistant/index.ts

@@ -21,7 +21,7 @@ import {
 
 const ROOT_FOLDER_ID = '0';
 const DEFAULT_PROVIDER_LABEL = 'Music Assistant';
-const DEFAULT_RADIO_SERVICE = 'musicassistant';
+const DEFAULT_SERVICE = 'musicassistant';
 const CACHE_TTL_MS = 30_000;
 
 // We are faking a NAS origin for all our Music Assistant library items
@@ -68,18 +68,18 @@ export class MusicAssistantProvider implements MediaProvider {
     const clientResolver = () => this.getClient();
     this.radioController = new RadioController(
       clientResolver,
-      DEFAULT_RADIO_SERVICE,
+      DEFAULT_SERVICE,
       CACHE_TTL_MS,
       DEFAULT_PROVIDER_LABEL,
     );
     this.playlistController = new PlaylistController(
       clientResolver,
-      DEFAULT_RADIO_SERVICE,
+      DEFAULT_SERVICE,
       DEFAULT_PROVIDER_LABEL,
     );
     this.libraryController = new LibraryController(
       clientResolver,
-      DEFAULT_RADIO_SERVICE,
+      DEFAULT_SERVICE,
       ROOT_FOLDER_ID,
       MEDIA_LIBRARY_ROOT_ITEMS,
     );

src/backend/provider/musicAssistant/mappers.ts

@@ -3,6 +3,7 @@ import {
   buildLibraryKey,
   buildLibraryUri,
   buildPlaylistKey,
+  buildPlaylistUri,
   buildRadioKey,
   extractAlbum,
   extractArtist,
@@ -12,6 +13,7 @@ import {
   extractProvider,
   extractUri,
   normalizeMediaUri,
+  toPlaylistCommandUri,
   safeNumber,
 } from './utils';
 import { MediaFolderItem, PlaylistItem, RadioFolderItem } from '../types';
@@ -174,10 +176,10 @@ export function mapTrackToPlaylistItem(
       playlistContext?.image,
     ]);
     playlistProviderInstanceId = extractProvider(playlistContext) ?? provider;
-    playlistCommandUri = normalizeMediaUri(
+    const rawPlaylistUri =
       extractUri(playlistContext, 'playlist', playlistRawId, playlistProviderInstanceId) ??
-        buildLibraryUri('playlist', playlistRawId, playlistProviderInstanceId),
-    );
+      buildPlaylistUri(playlistRawId, playlistProviderInstanceId);
+    playlistCommandUri = toPlaylistCommandUri(rawPlaylistUri, playlistProviderInstanceId, playlistRawId);
   }
 
   const trackCover = resolveArtwork(track, [track?.coverurl, track?.thumbnail, track?.image]);
@@ -216,7 +218,10 @@ export function mapPlaylistToItem(
 ): PlaylistItem {
   const provider = extractProvider(playlist) ?? fallbackProvider;
   const rawId = extractItemId(playlist) ?? extractUri(playlist) ?? extractName(playlist) ?? '';
-  const uri = extractUri(playlist, 'playlist', rawId, provider) ?? buildPlaylistKey(provider, rawId);
+  const rawUri =
+    extractUri(playlist, 'playlist', rawId, provider) ??
+    buildPlaylistUri(rawId, provider);
+  const uri = toPlaylistCommandUri(rawUri, provider, rawId);
   const name = extractName(playlist) ?? rawId;
   const cover = resolveArtwork(playlist, [playlist?.playlistCover, playlist?.coverurl, playlist?.thumbnail, playlist?.image]);
 

src/backend/provider/musicAssistant/playlist.ts

@@ -15,6 +15,7 @@ import {
   logError,
   parseIdentifier,
   safeNumber,
+  toPlaylistCommandUri,
 } from './utils';
 
 export class PlaylistController {
@@ -73,7 +74,7 @@ export class PlaylistController {
         : [];
 
       return {
-        id: this.fallbackProvider,
+        id: 0,
         name: `${this.providerLabel} Playlists`,
         totalitems: totalitems ?? items.length,
         start: offset,
@@ -129,9 +130,10 @@ export class PlaylistController {
         mapped.length,
       );
 
-      const uri =
+      const rawUri =
         extractUri(playlist, 'playlist', itemId, provider) ??
         `playlist:${itemId}`;
+      const playlistUri = toPlaylistCommandUri(rawUri, provider, itemId);
 
       const playlistCover = extractImage(playlist) ?? mapped.find((item) => item.coverurl)?.coverurl ?? '';
       if (playlistCover) {
@@ -142,7 +144,7 @@ export class PlaylistController {
       }
 
       return {
-        id: uri,
+        id: playlistUri,
         name: extractName(playlist) ?? itemId,
         totalitems: totalitems ?? mapped.length,
         start: offset,
@@ -178,9 +180,10 @@ export class PlaylistController {
 
       const mapped = mapPlaylistToItem(playlist, this.fallbackProvider);
       const rawId = extractItemId(playlist) ?? itemId;
-      const uri =
+      const rawUri =
         extractUri(playlist, 'playlist', rawId, provider) ??
         `playlist:${rawId}`;
+      const playlistUri = toPlaylistCommandUri(rawUri, provider, rawId);
       const totalitems = safeNumber(
         playlist?.track_count ??
           playlist?.items?.length ??
@@ -189,13 +192,13 @@ export class PlaylistController {
 
       return {
         ...mapped,
-        id: uri,
-        audiopath: uri,
+        id: playlistUri,
+        audiopath: playlistUri,
         provider: provider ?? mapped.provider,
         providerInstanceId: provider ?? mapped.providerInstanceId,
         playlistProviderInstanceId: provider ?? mapped.playlistProviderInstanceId,
-        playlistCommandUri: uri,
-        playlistId: uri,
+        playlistCommandUri: playlistUri,
+        playlistId: playlistUri,
         items: totalitems,
         coverurl: extractImage(playlist) ?? mapped.coverurl ?? '',
         rawId,
@@ -208,7 +211,7 @@ export class PlaylistController {
 
   private buildEmptyResponse(offset: number): PlaylistResponse {
     return {
-      id: this.fallbackProvider,
+      id: 0,
       name: `${this.providerLabel} Playlists`,
       totalitems: 0,
       start: offset,

src/backend/provider/musicAssistant/utils.ts

@@ -79,8 +79,22 @@ export function parsePlaylistIdentifier(value: string): ParsedKey | undefined {
   const [base, query = ''] = value.split('?', 2);
   const idPart = base.slice('playlist:'.length);
   const params = new URLSearchParams(query);
-  const provider = params.get('provider') ?? params.get('instance_id') ?? undefined;
-  const itemId = decodeURIComponent(idPart);
+  let provider = params.get('provider') ?? params.get('instance_id') ?? undefined;
+
+  let itemId: string;
+  if (!provider) {
+    const segments = idPart.split(':');
+    if (segments.length >= 2) {
+      provider = decodeSegment(segments[0]);
+      const encodedId = segments.slice(1).join(':');
+      itemId = decodeURIComponent(encodedId);
+    } else {
+      itemId = decodeURIComponent(idPart);
+    }
+  } else {
+    itemId = decodeURIComponent(idPart);
+  }
+
   return { kind: 'playlist', provider, itemId };
 }
 
@@ -117,6 +131,28 @@ export function parseCompositeIdentifier(value: string): ParsedKey {
   return { kind: head, provider, itemId };
 }
 
+export function toPlaylistCommandUri(
+  value: string | undefined,
+  fallbackProvider?: string,
+  fallbackId?: string,
+): string {
+  const parsed = value ? parseIdentifier(value) : { kind: '', provider: undefined, itemId: undefined };
+
+  if (parsed.kind === 'playlist' && parsed.itemId) {
+    return buildPlaylistUri(parsed.itemId, parsed.provider ?? fallbackProvider);
+  }
+
+  if (fallbackId) {
+    return buildPlaylistUri(fallbackId, parsed.provider ?? fallbackProvider);
+  }
+
+  if (value && value.toLowerCase().startsWith('playlist:')) {
+    return value;
+  }
+
+  return buildPlaylistUri('', fallbackProvider);
+}
+
 export function normalizeItemKey(value: string): string {
   if (!value) return value;
   const trimmed = value.trim();
@@ -140,9 +176,11 @@ export function buildLibraryUri(
 export function buildPlaylistUri(id: string, provider?: string): string {
   if (!id) return '';
   if (id.includes('://')) return id;
-  if (id.toLowerCase().startsWith('playlist:')) return id;
-  const base = `playlist:${id}`;
-  return provider ? `${base}?provider=${encodeURIComponent(provider)}` : base;
+  const safeId = encodeSegment(id);
+  if (!provider) {
+    return `playlist:${safeId}`;
+  }
+  return `playlist:${encodeSegment(provider)}:${safeId}`;
 }
 
 export function buildLibraryKey(
@@ -308,6 +346,26 @@ export function denormalizeMediaUri(uri: string): string {
   return uri;
 }
 
+export function denormalizePlaylistUri(value: string): string {
+  const trimmed = (value ?? '').trim();
+  if (!trimmed) return '';
+
+  if (trimmed.toLowerCase().startsWith('library://')) {
+    return trimmed;
+  }
+
+  const parsed = parseIdentifier(trimmed);
+  if (parsed.kind === 'playlist' && parsed.itemId) {
+    const playlistId = encodeURIComponent(parsed.itemId);
+    const provider = parsed.provider && parsed.provider.toLowerCase() !== 'library'
+      ? encodeURIComponent(parsed.provider)
+      : undefined;
+    return provider ? `library://playlist/${playlistId}?provider=${provider}` : `library://playlist/${playlistId}`;
+  }
+
+  return denormalizeMediaUri(trimmed);
+}
+
 export function extractName(item: any): string | undefined {
   if (!item || typeof item !== 'object') return undefined;
   const candidates = [

src/backend/zone/MusicAssistant/commands.ts

@@ -2,7 +2,7 @@ import { updateZoneGroup, getZoneById } from '../zonemanager';
 import { PlayerStatus, RepeatMode as LoxoneRepeatMode } from '../loxoneTypes';
 import logger from '../../../utils/troxorlogger';
 import MusicAssistantClient from './client';
-import { denormalizeMediaUri, normalizeMediaUri } from '../../provider/musicAssistant/utils';
+import { denormalizeMediaUri, denormalizePlaylistUri, normalizeMediaUri } from '../../provider/musicAssistant/utils';
 
 type RepeatMapping = {
   ma: 'off' | 'one' | 'all';
@@ -156,7 +156,7 @@ export async function handleMusicAssistantCommand(
         coerceToOptionalString(info.track);
       const normalizedPlaylistUri = normalizePlaylistCommandUri(playlistUri, playlistFallback);
       const targetUri = normalizedPlaylistUri || playlistUri || playlistFallback;
-      const maUri = denormalizeMediaUri(targetUri ?? playlistUri ?? '');
+      const maUri = denormalizePlaylistUri(targetUri ?? playlistUri ?? '') || denormalizeMediaUri(targetUri ?? playlistUri ?? '');
 
       logger.info(`[MusicAssistant][Zone:${ctx.loxoneZoneId}] playlistplay: ${targetUri}`);
 
@@ -345,6 +345,13 @@ function normalizePlaylistCommandUri(primary: string, fallback?: string): string
       return trimmed;
     }
 
+    if (lower.startsWith('playlist:')) {
+      const rest = trimmed.slice('playlist:'.length);
+      if (rest.includes(':') && !rest.includes('://')) {
+        return trimmed;
+      }
+    }
+
     if (lower.startsWith('library://')) resolved = trimmed;
     else if (lower.startsWith('playlist://')) resolved = trimmed;
     else if (lower.startsWith('http://') || lower.startsWith('https://')) resolved = trimmed;

src/http/handlers/zoneCommands.ts

@@ -2,6 +2,7 @@ import { CommandResult, emptyCommand, response } from './commandTypes';
 import { parseNumberPart, splitUrl } from './commandUtils';
 import { getZoneById, sendCommandToZone } from '../../backend/zone/zonemanager';
 import { getMediaProvider } from '../../backend/provider/factory';
+import { toPlaylistCommandUri } from '../../backend/provider/musicAssistant/utils';
 import logger from '../../utils/troxorlogger';
 import { MediaFolderItem, PlaylistItem } from '../../backend/provider/types';
 import { FileType } from '../../backend/zone/loxoneTypes';
@@ -632,6 +633,18 @@ export async function audioPlayUrl(url: string): Promise<CommandResult> {
   };
   addPlaylistCandidate(playlistIdFromQuery);
   addPlaylistCandidate(decodedBasePath);
+  // LEGACY(current): older client encodes playlist info under /parentpath or /parentid.
+  for (let i = 0; i < meta.length; i++) {
+    const token = meta[i]?.toLowerCase();
+    if (token === 'parentpath' || token === 'parentid') {
+      const candidate = meta[i + 1];
+      if (candidate) {
+        addPlaylistCandidate(decodeURIComponent(candidate));
+      }
+      i++;
+      continue;
+    }
+  }
 
   let resolvedPlaylist: PlaylistItem | undefined;
   if (provider.resolvePlaylist) {
@@ -757,21 +770,55 @@ export async function audioPlayUrl(url: string): Promise<CommandResult> {
 
   const providerHint =
     resolved?.provider ?? (decodedUri.includes(':') ? decodedUri.split(':')[0] : undefined) ?? 'external';
-  const sanitizedAudiopath = decodedUri.replace(/\/(?:no)?shuffle$/i, '');
+  const sanitizedAudiopath = decodedBasePath.replace(/\/(?:no)?shuffle$/i, '');
+  const localTrackMatch = decodedUri.match(/^library:local:track:([^:]+):/i);
+  const providerFromPath = localTrackMatch ? localTrackMatch[1] : undefined;
   const trackPayload: Record<string, unknown> = {
     id: resolved?.id ?? decodedUri,
     name: resolved?.title ?? resolved?.name ?? decodedUri,
     audiopath: sanitizedAudiopath,
     coverurl: resolved?.coverurl ?? '',
     type: resolved?.type ?? FileType.File,
-    provider: resolved?.provider ?? providerHint,
-    providerInstanceId: resolved?.providerInstanceId,
+    provider: resolved?.provider ?? providerFromPath ?? providerHint,
+    providerInstanceId: resolved?.providerInstanceId ?? providerFromPath,
     album: resolved?.album,
     artist: resolved?.artist,
     title: resolved?.title ?? resolved?.name,
     uniqueId: resolved?.id ?? decodedUri,
   };
 
+  const playlistCommandUri =
+    resolvedPlaylist?.playlistCommandUri ??
+    playlistContext?.playlistCommandUri ??
+    playlistRawCommand ??
+    playlistIdFromQuery ??
+    undefined;
+  if (playlistCommandUri) {
+    // LEGACY(current): queue UI requires playlist ids even when /playurl kicked off playback.
+    const normalizedPlaylist = toPlaylistCommandUri(playlistCommandUri, playlistContext?.playlistProviderInstanceId, playlistContext?.rawId);
+    trackPayload.playlistCommandUri = normalizedPlaylist;
+    trackPayload.playlistId = normalizedPlaylist;
+  }
+  if (playlistContext?.playlistProviderInstanceId ?? resolvedPlaylist?.playlistProviderInstanceId ?? resolvedPlaylist?.providerInstanceId) {
+    trackPayload.playlistProviderInstanceId =
+      resolvedPlaylist?.playlistProviderInstanceId ??
+      resolvedPlaylist?.providerInstanceId ??
+      playlistContext?.playlistProviderInstanceId;
+  }
+  if (playlistContext?.playlistCover ?? resolvedPlaylist?.playlistCover) {
+    trackPayload.playlistCover = resolvedPlaylist?.playlistCover ?? playlistContext?.playlistCover;
+  }
+  if (playlistContext?.playlistStartItem ?? resolvedPlaylist?.playlistStartItem ?? startItemParam ?? originalStartItemParam) {
+    trackPayload.playlistStartItem =
+      resolvedPlaylist?.playlistStartItem ??
+      playlistContext?.playlistStartItem ??
+      startItemParam ??
+      originalStartItemParam;
+  }
+  if (playlistContext?.playlistName ?? resolvedPlaylist?.playlistName) {
+    trackPayload.playlistName = resolvedPlaylist?.playlistName ?? playlistContext?.playlistName;
+  }
+
   if (shuffle !== undefined) {
     trackPayload.shuffle = shuffle ? 1 : 0;
   }
@@ -834,13 +881,7 @@ function buildEmptyQueue(url: string, zoneId: number): CommandResult {
 }
 
 function ensurePlaylistCommandUri(value: string): string {
-  const trimmed = (value || '').trim();
-  if (!trimmed) return '';
-  const lower = trimmed.toLowerCase();
-  if (lower.includes('://') || lower.startsWith('playlist:')) {
-    return trimmed;
-  }
-  return `playlist:${trimmed}`;
+  return toPlaylistCommandUri(value);
 }
 
 function buildFriendlyPlaylistPath(rawId: string): string {