fix(build): remove circular dependency

move emby header to jellyfin class instead externalapi class
fallenbagel · Jan 15, 2025 · 973e8d1 · 973e8d1
1 parent 353d079
commit 973e8d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/server/api/externalapi.ts b/server/api/externalapi.ts
@@ -1,5 +1,3 @@
-import { MediaServerType } from '@server/constants/server';
-import { getSettings } from '@server/lib/settings';
 import type { RateLimitOptions } from '@server/utils/rateLimit';
 import rateLimit from '@server/utils/rateLimit';
 import type NodeCache from 'node-cache';
@@ -36,8 +34,6 @@ class ExternalAPI {
 
     const url = new URL(baseUrl);
 
-    const settings = getSettings();
-
     this.defaultHeaders = {
       'Content-Type': 'application/json',
       Accept: 'application/json',
@@ -46,9 +42,7 @@ class ExternalAPI {
           `${url.username}:${url.password}`
         ).toString('base64')}`,
       }),
-      ...(settings.main.mediaServerType === MediaServerType.EMBY && {
-        'Accept-Encoding': 'gzip',
-      }),
+
       ...options.headers,
     };
 

diff --git a/server/api/jellyfin.ts b/server/api/jellyfin.ts
@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import ExternalAPI from '@server/api/externalapi';
 import { ApiErrorCode } from '@server/constants/error';
+import { MediaServerType } from '@server/constants/server';
 import availabilitySync from '@server/lib/availabilitySync';
+import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { ApiError } from '@server/types/error';
 import { getAppVersion } from '@server/utils/appVersion';
@@ -103,12 +105,17 @@ class JellyfinAPI extends ExternalAPI {
       authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}"`;
     }
 
+    const settings = getSettings();
+
     super(
       jellyfinHost,
       {},
       {
         headers: {
           'X-Emby-Authorization': authHeaderVal,
+          ...(settings.main.mediaServerType === MediaServerType.EMBY && {
+            'Accept-Encoding': 'gzip',
+          }),
         },
       }
     );