From 406d7ce812c9a20f5b28c50ad0dc486ac4f943ca Mon Sep 17 00:00:00 2001
From: mtvpls <mtvpls@redaaa.ip-ddns.com>
Date: Sat, 7 Mar 2026 10:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9jellyfin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/emby.client.ts | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/lib/emby.client.ts b/src/lib/emby.client.ts
index 067458a..10315c0 100644
--- a/src/lib/emby.client.ts
+++ b/src/lib/emby.client.ts
@@ -123,12 +123,16 @@ export class EmbyClient {
     }
   }
 
-  private getHeaders(): Record<string, string> {
+  private getHeaders(includeContentType: boolean = false): Record<string, string> {
     const headers: Record<string, string> = {
-      'Content-Type': 'application/json',
       'User-Agent': this.customUserAgent,
     };
 
+    // 只在需要时添加 Content-Type（POST/PUT 请求）
+    if (includeContentType) {
+      headers['Content-Type'] = 'application/json';
+    }
+
     if (this.apiKey) {
       headers['X-Emby-Token'] = this.apiKey;
     } else if (this.authToken) {
@@ -141,7 +145,7 @@ export class EmbyClient {
   async authenticate(username: string, password: string): Promise<{ AccessToken: string; User: { Id: string } }> {
     const url = `${this.serverUrl}/Users/AuthenticateByName`;
 
-    const params = new URLSearchParams({
+    const body = JSON.stringify({
       Username: username,
       Pw: password,
     });
@@ -149,11 +153,11 @@ export class EmbyClient {
     const response = await fetch(url, {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
+        'Content-Type': 'application/json',
         'X-Emby-Authorization': 'MediaBrowser Client="LunaTV", Device="Web", DeviceId="lunatv-web", Version="1.0.0"',
         'User-Agent': this.customUserAgent,
       },
-      body: params.toString(),
+      body: body,
     });
 
     if (!response.ok) {
@@ -195,8 +199,8 @@ export class EmbyClient {
     const response = await fetch(url);
 
     // 如果是 401 错误且有用户名密码，尝试重新认证
-    if (response.status === 401 && this.username && this.password && !this.apiKey) {
-      const authResult = await this.authenticate(this.username, this.password);
+    if (response.status === 401 && this.username && !this.apiKey) {
+      const authResult = await this.authenticate(this.username, this.password || '');
       this.authToken = authResult.AccessToken;
       this.userId = authResult.User.Id;
 
@@ -244,7 +248,7 @@ export class EmbyClient {
     // 添加认证参数
     const token = this.apiKey || this.authToken;
     if (token) {
-      searchParams.set('X-Emby-Token', token);
+      searchParams.set('api_key', token);
     }
 
     const url = `${this.serverUrl}/Users/${this.userId}/Items?${searchParams.toString()}`;
@@ -252,13 +256,13 @@ export class EmbyClient {
     const response = await fetch(url);
 
     // 如果是 401 错误且有用户名密码，尝试重新认证
-    if (response.status === 401 && this.username && this.password && !this.apiKey) {
-      const authResult = await this.authenticate(this.username, this.password);
+    if (response.status === 401 && this.username && !this.apiKey) {
+      const authResult = await this.authenticate(this.username, this.password || '');
       this.authToken = authResult.AccessToken;
       this.userId = authResult.User.Id;
 
       // 重试请求
-      searchParams.set('X-Emby-Token', this.authToken);
+      searchParams.set('api_key', this.authToken);
       const retryUrl = `${this.serverUrl}/Users/${this.userId}/Items?${searchParams.toString()}`;
       const retryResponse = await fetch(retryUrl);
 
@@ -290,8 +294,8 @@ export class EmbyClient {
     const response = await fetch(url);
 
     // 如果是 401 错误且有用户名密码，尝试重新认证
-    if (response.status === 401 && this.username && this.password && !this.apiKey) {
-      const authResult = await this.authenticate(this.username, this.password);
+    if (response.status === 401 && this.username && !this.apiKey) {
+      const authResult = await this.authenticate(this.username, this.password || '');
       this.authToken = authResult.AccessToken;
       this.userId = authResult.User.Id;
 
@@ -326,8 +330,8 @@ export class EmbyClient {
     const response = await fetch(url);
 
     // 如果是 401 错误且有用户名密码，尝试重新认证
-    if (response.status === 401 && this.username && this.password && !this.apiKey) {
-      const authResult = await this.authenticate(this.username, this.password);
+    if (response.status === 401 && this.username && !this.apiKey) {
+      const authResult = await this.authenticate(this.username, this.password || '');
       this.authToken = authResult.AccessToken;
       this.userId = authResult.User.Id;
 
@@ -377,8 +381,8 @@ export class EmbyClient {
     const response = await fetch(url);
 
     // 如果是 401 错误且有用户名密码，尝试重新认证
-    if (response.status === 401 && this.username && this.password && !this.apiKey) {
-      const authResult = await this.authenticate(this.username, this.password);
+    if (response.status === 401 && this.username && !this.apiKey) {
+      const authResult = await this.authenticate(this.username, this.password || '');
       this.authToken = authResult.AccessToken;
       this.userId = authResult.User.Id;