From f6b014704952a6e271cefe7cf812ccef15a856ab Mon Sep 17 00:00:00 2001
From: Gauthier <mail@gauthierth.fr>
Date: Fri, 4 Apr 2025 15:26:23 +0200
Subject: [PATCH] fix: correct rebase issue

---
 server/api/servarr/radarr.ts     |  5 +----
 server/api/servarr/sonarr.ts     |  6 +-----
 server/routes/avatarproxy.ts     | 15 ++++++++++-----
 server/utils/customProxyAgent.ts | 12 +++---------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/server/api/servarr/radarr.ts b/server/api/servarr/radarr.ts
index e11aca9a..3d0cf53a 100644
--- a/server/api/servarr/radarr.ts
+++ b/server/api/servarr/radarr.ts
@@ -271,13 +271,10 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
     if (tmdbId) {
       this.removeCache('/movie/lookup', {
         term: `tmdb:${tmdbId}`,
-        headers: this.defaultHeaders,
       });
     }
     if (externalId) {
-      this.removeCache(`/movie/${externalId}`, {
-        headers: this.defaultHeaders,
-      });
+      this.removeCache(`/movie/${externalId}`);
     }
   };
 }
diff --git a/server/api/servarr/sonarr.ts b/server/api/servarr/sonarr.ts
index ab8e837e..6f13867c 100644
--- a/server/api/servarr/sonarr.ts
+++ b/server/api/servarr/sonarr.ts
@@ -369,18 +369,14 @@ class SonarrAPI extends ServarrBase<{
     if (tvdbId) {
       this.removeCache('/series/lookup', {
         term: `tvdb:${tvdbId}`,
-        headers: this.defaultHeaders,
       });
     }
     if (externalId) {
-      this.removeCache(`/series/${externalId}`, {
-        headers: this.defaultHeaders,
-      });
+      this.removeCache(`/series/${externalId}`);
     }
     if (title) {
       this.removeCache('/series/lookup', {
         term: title,
-        headers: this.defaultHeaders,
       });
     }
   };
diff --git a/server/routes/avatarproxy.ts b/server/routes/avatarproxy.ts
index 0065f011..15118d1d 100644
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -6,6 +6,7 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { getAppVersion } from '@server/utils/appVersion';
 import { getHostname } from '@server/utils/getHostname';
+import axios from 'axios';
 import { Router } from 'express';
 import gravatarUrl from 'gravatar-url';
 import { createHash } from 'node:crypto';
@@ -54,22 +55,26 @@ export async function checkAvatarChanged(
 
     const jellyfinAvatarUrl = getJellyfinAvatarUrl(user.jellyfinUserId);
 
-    const headResponse = await fetch(jellyfinAvatarUrl, { method: 'HEAD' });
-    if (!headResponse.ok) {
+    let headResponse;
+    try {
+      headResponse = await axios.head(jellyfinAvatarUrl);
+      if (headResponse.status !== 200) {
+        return { changed: false };
+      }
+    } catch (error) {
       return { changed: false };
     }
 
     const settings = getSettings();
     let remoteVersion: string;
     if (settings.main.mediaServerType === MediaServerType.JELLYFIN) {
-      const remoteLastModifiedStr =
-        headResponse.headers.get('last-modified') || '';
+      const remoteLastModifiedStr = headResponse.headers['last-modified'] || '';
       remoteVersion = (
         Date.parse(remoteLastModifiedStr) || Date.now()
       ).toString();
     } else if (settings.main.mediaServerType === MediaServerType.EMBY) {
       remoteVersion =
-        headResponse.headers.get('etag')?.replace(/"/g, '') ||
+        headResponse.headers['etag']?.replace(/"/g, '') ||
         Date.now().toString();
     } else {
       remoteVersion = Date.now().toString();
diff --git a/server/utils/customProxyAgent.ts b/server/utils/customProxyAgent.ts
index 5f163c3d..040ac5cd 100644
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -1,5 +1,6 @@
 import type { ProxySettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import type { Dispatcher } from 'undici';
 import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';
 
@@ -73,15 +74,8 @@ export default async function createCustomProxyAgent(
   }
 
   try {
-    const res = await fetch('https://www.google.com', { method: 'HEAD' });
-    if (res.ok) {
-      logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
-    } else {
-      logger.error('Proxy responded, but with a non-OK status: ' + res.status, {
-        label: 'Proxy',
-      });
-      setGlobalDispatcher(defaultAgent);
-    }
+    await axios.head('https://www.google.com');
+    logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
   } catch (e) {
     logger.error(
       'Failed to connect to the proxy: ' + e.message + ': ' + e.cause,