@francofantomius/jellyfin 0.4.0 → 0.4.1

package/dist/index.d.cts

@@ -306,10 +306,11 @@ interface AudioStreamOptions {
     transcodingContainer?: string;
     audioCodec?: string;
     deviceId?: string;
+    mediaSourceId?: string;
     /**
-     * Whether to include the api_key token in the URL query parameters.
+     * Whether to include the authentication token in the URL query parameters (ApiKey, api_key, X-Emby-Token).
      * Defaults to true for HTML5 <audio> tag compatibility.
-     * If false, callers are expected to provide Authorization headers.
+     * Set to false when providing modern Authorization headers to avoid conflicting authentication credentials in Jellyfin 12+.
      */
     useQueryToken?: boolean;
 }
@@ -320,10 +321,11 @@ interface AudioHlsStreamOptions {
     audioCodec?: string;
     segmentLength?: number;
     deviceId?: string;
+    mediaSourceId?: string;
     /**
-     * Whether to include the api_key token in the URL query parameters.
+     * Whether to include the authentication token in the URL query parameters (ApiKey, api_key, X-Emby-Token).
      * Defaults to true for legacy compatibility.
-     * If false, players (e.g. hls.js) should be configured with Authorization headers via xhrSetup.
+     * Set to false when players (e.g. hls.js) are configured with Authorization headers via xhrSetup to prevent 401s from conflicting auth methods in Jellyfin 12+.
      */
     useQueryToken?: boolean;
 }
@@ -1146,8 +1148,11 @@ declare class MediaModule {
     /**
      * Returns authentication headers for media streaming requests (e.g., configuring hls.js xhrSetup).
      * Crucial for Jellyfin 12+ servers where query-based auth (?api_key=) is disabled.
+     * Pass { legacy: false } to only send Authorization and avoid conflicting headers or reverse-proxy CORS rejections.
      */
-    getStreamHeaders(): Record<string, string>;
+    getStreamHeaders(options?: {
+        legacy?: boolean;
+    }): Record<string, string>;
 }
 
 declare class LyricsModule {

package/dist/index.d.ts

@@ -306,10 +306,11 @@ interface AudioStreamOptions {
     transcodingContainer?: string;
     audioCodec?: string;
     deviceId?: string;
+    mediaSourceId?: string;
     /**
-     * Whether to include the api_key token in the URL query parameters.
+     * Whether to include the authentication token in the URL query parameters (ApiKey, api_key, X-Emby-Token).
      * Defaults to true for HTML5 <audio> tag compatibility.
-     * If false, callers are expected to provide Authorization headers.
+     * Set to false when providing modern Authorization headers to avoid conflicting authentication credentials in Jellyfin 12+.
      */
     useQueryToken?: boolean;
 }
@@ -320,10 +321,11 @@ interface AudioHlsStreamOptions {
     audioCodec?: string;
     segmentLength?: number;
     deviceId?: string;
+    mediaSourceId?: string;
     /**
-     * Whether to include the api_key token in the URL query parameters.
+     * Whether to include the authentication token in the URL query parameters (ApiKey, api_key, X-Emby-Token).
      * Defaults to true for legacy compatibility.
-     * If false, players (e.g. hls.js) should be configured with Authorization headers via xhrSetup.
+     * Set to false when players (e.g. hls.js) are configured with Authorization headers via xhrSetup to prevent 401s from conflicting auth methods in Jellyfin 12+.
      */
     useQueryToken?: boolean;
 }
@@ -1146,8 +1148,11 @@ declare class MediaModule {
     /**
      * Returns authentication headers for media streaming requests (e.g., configuring hls.js xhrSetup).
      * Crucial for Jellyfin 12+ servers where query-based auth (?api_key=) is disabled.
+     * Pass { legacy: false } to only send Authorization and avoid conflicting headers or reverse-proxy CORS rejections.
      */
-    getStreamHeaders(): Record<string, string>;
+    getStreamHeaders(options?: {
+        legacy?: boolean;
+    }): Record<string, string>;
 }
 
 declare class LyricsModule {

package/dist/index.js

@@ -1186,6 +1186,7 @@ var MediaModule = class {
     const qualityResolved = resolveAudioQuality(options.quality);
     const maxStreamingBitrate = options.maxStreamingBitrate ?? qualityResolved.maxStreamingBitrate;
     const {
+      mediaSourceId,
       static: isStatic = false,
       startTimeTicks = 0,
       container = "opus,mp3|mp3,aac,m4a,m4b,flac,wav,ogg",
@@ -1196,12 +1197,14 @@ var MediaModule = class {
     const endpoint = isStatic ? `/Audio/${itemId}/stream` : `/Audio/${itemId}/universal`;
     const url = new URL(`${serverUrl}${endpoint}`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
     if (userId) url.searchParams.append("UserId", userId);
     const targetDeviceId = options.deviceId !== void 0 ? options.deviceId : clientInfo.deviceId;
     if (targetDeviceId) url.searchParams.append("DeviceId", targetDeviceId);
+    if (mediaSourceId) url.searchParams.append("MediaSourceId", mediaSourceId);
     if (isStatic) {
       url.searchParams.append("static", "true");
     } else {
@@ -1232,6 +1235,7 @@ var MediaModule = class {
     const qualityResolved = resolveAudioQuality(options.quality);
     const maxStreamingBitrate = options.maxStreamingBitrate ?? qualityResolved.maxStreamingBitrate;
     const {
+      mediaSourceId,
       startTimeTicks = 0,
       audioCodec = "aac,mp3",
       segmentLength = 3,
@@ -1239,13 +1243,16 @@ var MediaModule = class {
     } = options;
     const url = new URL(`${serverUrl}/Audio/${itemId}/master.m3u8`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
     if (userId) url.searchParams.append("UserId", userId);
     const targetDeviceId = options.deviceId !== void 0 ? options.deviceId : clientInfo.deviceId;
     if (targetDeviceId) url.searchParams.append("DeviceId", targetDeviceId);
-    url.searchParams.append("MediaSourceId", itemId);
+    if (mediaSourceId) {
+      url.searchParams.append("MediaSourceId", mediaSourceId);
+    }
     url.searchParams.append("AudioCodec", audioCodec);
     url.searchParams.append("TranscodingContainer", "ts");
     url.searchParams.append("TranscodingProtocol", "hls");
@@ -1291,6 +1298,7 @@ var MediaModule = class {
     const endpoint = container && !container.includes(",") ? `/Videos/${itemId}/stream.${container}` : `/Videos/${itemId}/stream`;
     const url = new URL(`${serverUrl}${endpoint}`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
@@ -1356,6 +1364,7 @@ var MediaModule = class {
     } = options;
     const url = new URL(`${serverUrl}/Videos/${itemId}/master.m3u8`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
@@ -1398,6 +1407,7 @@ var MediaModule = class {
     const sourceId = mediaSourceId || itemId;
     const url = new URL(`${serverUrl}/Videos/${itemId}/${sourceId}/Subtitles/${subtitleStreamIndex}/Stream.${format}`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
     }
     if (startTimeTicks > 0) {
@@ -1471,6 +1481,7 @@ var MediaModule = class {
     if (!serverUrl || !itemId) return "";
     const url = new URL(`${serverUrl}/Items/${itemId}/Download`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
     }
     if (filename) {
@@ -1517,13 +1528,17 @@ var MediaModule = class {
   /**
    * Returns authentication headers for media streaming requests (e.g., configuring hls.js xhrSetup).
    * Crucial for Jellyfin 12+ servers where query-based auth (?api_key=) is disabled.
+   * Pass { legacy: false } to only send Authorization and avoid conflicting headers or reverse-proxy CORS rejections.
    */
-  getStreamHeaders() {
+  getStreamHeaders(options = {}) {
     const authHeader = this.http.getAuthHeader();
-    return {
-      Authorization: authHeader,
-      "X-Emby-Authorization": authHeader
+    const headers = {
+      Authorization: authHeader
     };
+    if (options.legacy ?? true) {
+      headers["X-Emby-Authorization"] = authHeader;
+    }
+    return headers;
   }
 };
 
@@ -2855,6 +2870,7 @@ var TrickplayModule = class {
     const { mediaSourceId, useQueryToken = true } = options;
     const url = new URL(`${serverUrl}/Videos/${itemId}/Trickplay/${width}/tiles.m3u8`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
@@ -2873,6 +2889,7 @@ var TrickplayModule = class {
     const { mediaSourceId, useQueryToken = true } = options;
     const url = new URL(`${serverUrl}/Videos/${itemId}/Trickplay/${width}/${index}.jpg`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
@@ -3063,6 +3080,7 @@ var ChaptersModule = class {
     } = options;
     const url = new URL(`${serverUrl}/Items/${itemId}/Images/Chapter/${chapterIndex}`);
     if (token && useQueryToken) {
+      url.searchParams.append("ApiKey", token);
       url.searchParams.append("api_key", token);
       url.searchParams.append("X-Emby-Token", token);
     }
@@ -3747,7 +3765,7 @@ var JellyfinClient = class {
     this.cache = new MemoryCacheAdapter();
     this.clientInfo = {
       name: options.clientInfo?.name || "@francofantomius/jellyfin",
-      version: options.clientInfo?.version || "0.4.0",
+      version: options.clientInfo?.version || "0.4.1",
       device: options.clientInfo?.device || (typeof window !== "undefined" ? "Web Browser" : "Node.js"),
       deviceId: options.clientInfo?.deviceId || generateDeviceId()
     };