refactor: try to switch externalapi to axios to fix performance issue

fix: resolve error when setup on second attempt (#1061 )
docs: migrate to docker compose v2 (#1073 )
2025-12-24 10:49:30 -05:00 · 2024-11-06 21:16:47 +01:00 · 2024-11-06 15:21:19 +08:00 · 2024-11-04 22:48:37 +08:00 · 2024-11-03 14:35:20 +08:00 · 2024-10-31 16:10:45 +01:00
33 changed files with 999 additions and 652 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,7 +18,7 @@ config/logs/*
 config/*.json
 dist
 Dockerfile*
-docker-compose.yml
+compose.yaml
 docs
 LICENSE
 node_modules
--- a/.gitattributes
+++ b/.gitattributes
@@ -40,7 +40,7 @@ docs export-ignore
 .all-contributorsrc export-ignore
 .editorconfig export-ignore
 Dockerfile.local export-ignore
-docker-compose.yml export-ignore
+compose.yaml export-ignore
 stylelint.config.js export-ignore

 public/os_logo_filled.png export-ignore
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,7 +52,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
   pnpm dev
   ```

-   - Alternatively, you can use [Docker](https://www.docker.com/) with `docker-compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
+   - Alternatively, you can use [Docker](https://www.docker.com/) with `docker compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.

 5. Create your patch and test your changes.

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
  jellyseerr:
    build:
--- a/docs/extending-jellyseerr/reverse-proxy.mdx
+++ b/docs/extending-jellyseerr/reverse-proxy.mdx
@@ -190,7 +190,7 @@ Caddy will automatically obtain and renew SSL certificates for your domain.

 ## Traefik (v2)

-Add the following labels to the Jellyseerr service in your `docker-compose.yml` file:
+Add the following labels to the Jellyseerr service in your `compose.yaml` file:

 ```yaml
 labels:
--- a/docs/getting-started/docker.mdx
+++ b/docs/getting-started/docker.mdx
@@ -71,7 +71,7 @@ You could also use [diun](https://github.com/crazy-max/diun) to receive notifica
 For details on how to use Docker Compose, please [review the official Compose documentation](https://docs.docker.com/compose/reference/).

 #### Installation:
-Define the `jellyseerr` service in your `docker-compose.yml` as follows:
+Define the `jellyseerr` service in your `compose.yaml` as follows:
 ```yaml
 ---
 services:
@@ -94,17 +94,17 @@ If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable

 Then, start all services defined in the Compose file:
 ```bash
-docker-compose up -d
+docker compose up -d
 ```

 #### Updating:
 Pull the latest image:
 ```bash
-docker-compose pull jellyseerr
+docker compose pull jellyseerr
 ```
 Then, restart all services defined in the Compose file:
 ```bash
-docker-compose up -d
+docker compose up -d
 ```
 :::tip
 You may alternatively use a third-party mechanism like [dockge](https://github.com/louislam/dockge) to manage your docker compose files.
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
    "@svgr/webpack": "6.5.1",
    "@tanem/react-nprogress": "5.0.30",
    "ace-builds": "1.15.2",
+    "axios": "^1.7.7",
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
    "connect-typeorm": "1.1.4",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
      ace-builds:
        specifier: 1.15.2
        version: 1.15.2
+      axios:
+        specifier: ^1.7.7
+        version: 1.7.7
      bcrypt:
        specifier: 5.1.0
        version: 5.1.0(encoding@0.1.13)
@@ -3402,6 +3405,9 @@ packages:
    resolution: {integrity: sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==}
    engines: {node: '>=4'}

+  axios@1.7.7:
+    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
+
  axobject-query@3.1.1:
    resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==}

@@ -5022,6 +5028,15 @@ packages:
  fn.name@1.1.0:
    resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}

+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
  for-each@0.3.3:
    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

@@ -5036,6 +5051,10 @@ packages:
    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
    engines: {node: '>= 0.12'}

+  form-data@4.0.1:
+    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
+    engines: {node: '>= 6'}
+
  formik@2.4.6:
    resolution: {integrity: sha512-A+2EI7U7aG296q2TLGvNapDNTZp1khVt5Vk0Q/fyfSROss0V/V6+txt2aJnwEos44IxTCW/LYAi/zgWzlevj+g==}
    peerDependencies:
@@ -7384,6 +7403,9 @@ packages:
  proxy-from-env@1.0.0:
    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}

+  proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+
  psl@1.9.0:
    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}

@@ -13263,6 +13285,14 @@ snapshots:

  axe-core@4.9.1: {}

+  axios@1.7.7:
+    dependencies:
+      follow-redirects: 1.15.9
+      form-data: 4.0.1
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
  axobject-query@3.1.1:
    dependencies:
      deep-equal: 2.2.3
@@ -15278,6 +15308,8 @@ snapshots:

  fn.name@1.1.0: {}

+  follow-redirects@1.15.9: {}
+
  for-each@0.3.3:
    dependencies:
      is-callable: 1.2.7
@@ -15295,6 +15327,12 @@ snapshots:
      combined-stream: 1.0.8
      mime-types: 2.1.35

+  form-data@4.0.1:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+
  formik@2.4.6(react@18.3.1):
    dependencies:
      '@types/hoist-non-react-statics': 3.3.5
@@ -17842,6 +17880,8 @@ snapshots:

  proxy-from-env@1.0.0: {}

+  proxy-from-env@1.1.0: {}
+
  psl@1.9.0: {}

  pstree.remy@1.1.8: {}
--- a/server/api/externalapi.ts
+++ b/server/api/externalapi.ts
@@ -1,5 +1,6 @@
-import type { RateLimitOptions } from '@server/utils/rateLimit';
-import rateLimit from '@server/utils/rateLimit';
+import type { AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+// import rateLimit from 'axios-rate-limit';
 import type NodeCache from 'node-cache';

 // 5 minute default TTL (in seconds)
@@ -11,87 +12,71 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
  nodeCache?: NodeCache;
  headers?: Record<string, unknown>;
-  rateLimit?: RateLimitOptions;
+  rateLimit?: {
+    maxRPS: number;
+    maxRequests: number;
+  };
 }

 class ExternalAPI {
-  protected fetch: typeof fetch;
-  protected params: Record<string, string>;
-  protected defaultHeaders: { [key: string]: string };
+  protected axios: AxiosInstance;
  private baseUrl: string;
  private cache?: NodeCache;

  constructor(
    baseUrl: string,
-    params: Record<string, string> = {},
+    params: Record<string, unknown>,
    options: ExternalAPIOptions = {}
  ) {
-    if (options.rateLimit) {
-      this.fetch = rateLimit(fetch, options.rateLimit);
-    } else {
-      this.fetch = fetch;
-    }
+    this.axios = axios.create({
+      baseURL: baseUrl,
+      params,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+        ...options.headers,
+      },
+    });
+
+    // if (options.rateLimit) {
+    //   this.axios = rateLimit(this.axios, {
+    //     maxRequests: options.rateLimit.maxRequests,
+    //     maxRPS: options.rateLimit.maxRPS,
+    //   });
+    // }

    this.baseUrl = baseUrl;
-    this.params = params;
-    this.defaultHeaders = {
-      'Content-Type': 'application/json',
-      Accept: 'application/json',
-      ...options.headers,
-    };
    this.cache = options.nodeCache;
  }

  protected async get<T>(
    endpoint: string,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...params,
-    });
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
    const cachedItem = this.cache?.get<T>(cacheKey);
    if (cachedItem) {
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const data = await this.getDataFromResponse(response);
+    const response = await this.axios.get<T>(endpoint, config);

-    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+    if (this.cache) {
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
    }

-    return data;
+    return response.data;
  }

  protected async post<T>(
    endpoint: string,
    data?: Record<string, unknown>,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
+      config: config?.params,
      data,
    });
    const cachedItem = this.cache?.get<T>(cacheKey);
@@ -99,43 +84,23 @@ class ExternalAPI {
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'POST',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-      body: data ? JSON.stringify(data) : undefined,
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const resData = await this.getDataFromResponse(response);
+    const response = await this.axios.post<T>(endpoint, data, config);

-    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
+    if (this.cache) {
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
    }

-    return resData;
+    return response.data;
  }

  protected async put<T>(
    endpoint: string,
    data: Record<string, unknown>,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
+      config: config?.params,
      data,
    });
    const cachedItem = this.cache?.get<T>(cacheKey);
@@ -143,73 +108,41 @@ class ExternalAPI {
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'PUT',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-      body: JSON.stringify(data),
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const resData = await this.getDataFromResponse(response);
+    const response = await this.axios.put<T>(endpoint, data, config);

-    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
+    if (this.cache) {
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
    }

-    return resData;
+    return response.data;
  }

  protected async delete<T>(
    endpoint: string,
-    params?: Record<string, string>,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'DELETE',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
+    const cachedItem = this.cache?.get<T>(cacheKey);
+    if (cachedItem) {
+      return cachedItem;
    }
-    const data = await this.getDataFromResponse(response);

-    return data;
+    const response = await this.axios.delete<T>(endpoint, config);
+
+    if (this.cache) {
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+    }
+
+    return response.data;
  }

  protected async getRolling<T>(
    endpoint: string,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit,
-    overwriteBaseUrl?: string
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...params,
-    });
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
    const cachedItem = this.cache?.get<T>(cacheKey);

    if (cachedItem) {
@@ -220,78 +153,20 @@ class ExternalAPI {
        keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
        Date.now() - DEFAULT_ROLLING_BUFFER
      ) {
-        const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
-        this.fetch(url, {
-          ...config,
-          headers: {
-            ...this.defaultHeaders,
-            ...config?.headers,
-          },
-        }).then(async (response) => {
-          if (!response.ok) {
-            const text = await response.text();
-            throw new Error(
-              `${response.status} ${response.statusText}${
-                text ? ': ' + text : ''
-              }`,
-              {
-                cause: response,
-              }
-            );
-          }
-          const data = await this.getDataFromResponse(response);
-          this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+        this.axios.get<T>(endpoint, config).then((response) => {
+          this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
        });
      }
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
-    const response = await this.fetch(url, {
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const data = await this.getDataFromResponse(response);
+    const response = await this.axios.get<T>(endpoint, config);

    if (this.cache) {
-      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
    }

-    return data;
-  }
-
-  private formatUrl(
-    endpoint: string,
-    params?: Record<string, string>,
-    overwriteBaseUrl?: string
-  ): string {
-    const baseUrl = overwriteBaseUrl || this.baseUrl;
-    const href =
-      baseUrl +
-      (baseUrl.endsWith('/') ? '' : '/') +
-      (endpoint.startsWith('/') ? endpoint.slice(1) : endpoint);
-    const searchParams = new URLSearchParams({
-      ...this.params,
-      ...params,
-    });
-    return (
-      href +
-      (searchParams.toString().length
-        ? '?' + searchParams.toString()
-        : searchParams.toString())
-    );
+    return response.data;
  }

  private serializeCacheKey(
@@ -304,29 +179,6 @@ class ExternalAPI {

    return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
  }
-
-  private async getDataFromResponse(response: Response) {
-    const contentType = response.headers.get('Content-Type');
-    if (contentType?.includes('application/json')) {
-      return await response.json();
-    } else if (
-      contentType?.includes('application/xml') ||
-      contentType?.includes('text/html') ||
-      contentType?.includes('text/plain')
-    ) {
-      return await response.text();
-    } else {
-      try {
-        return await response.json();
-      } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
-      }
-    }
-  }
 }

 export default ExternalAPI;
--- a/server/api/github.ts
+++ b/server/api/github.ts
@@ -1,6 +1,6 @@
-import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import logger from '@server/logger';
+import ExternalAPI from './externalapi';

 interface GitHubRelease {
  url: string;
@@ -67,6 +67,10 @@ class GithubAPI extends ExternalAPI {
      'https://api.github.com',
      {},
      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
        nodeCache: cacheManager.getCache('github').data,
      }
    );
@@ -81,7 +85,9 @@ class GithubAPI extends ExternalAPI {
      const data = await this.get<GitHubRelease[]>(
        '/repos/fallenbagel/jellyseerr/releases',
        {
-          per_page: take.toString(),
+          params: {
+            per_page: take,
+          },
        }
      );

@@ -106,8 +112,10 @@ class GithubAPI extends ExternalAPI {
      const data = await this.get<GithubCommit[]>(
        '/repos/fallenbagel/jellyseerr/commits',
        {
-          per_page: take.toString(),
-          branch,
+          params: {
+            per_page: take,
+            branch,
+          },
        }
      );

--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -129,8 +129,6 @@ class JellyfinAPI extends ExternalAPI {
          Username,
          Pw: Password,
        },
-        {},
-        undefined,
        { headers }
      );
    };
@@ -293,13 +291,15 @@ class JellyfinAPI extends ExternalAPI {
      const libraryItemsResponse = await this.get<any>(
        `/Users/${this.userId}/Items`,
        {
-          SortBy: 'SortName',
-          SortOrder: 'Ascending',
-          IncludeItemTypes: 'Series,Movie,Others',
-          Recursive: 'true',
-          StartIndex: '0',
-          ParentId: id,
-          collapseBoxSetItems: 'false',
+          params: {
+            SortBy: 'SortName',
+            SortOrder: 'Ascending',
+            IncludeItemTypes: 'Series,Movie,Others',
+            Recursive: 'true',
+            StartIndex: '0',
+            ParentId: id,
+            collapseBoxSetItems: 'false',
+          },
        }
      );

@@ -321,8 +321,10 @@ class JellyfinAPI extends ExternalAPI {
      const itemResponse = await this.get<any>(
        `/Users/${this.userId}/Items/Latest`,
        {
-          Limit: '12',
-          ParentId: id,
+          params: {
+            Limit: '12',
+            ParentId: id,
+          },
        }
      );

@@ -384,7 +386,9 @@ class JellyfinAPI extends ExternalAPI {
      const episodeResponse = await this.get<any>(
        `/Shows/${seriesID}/Episodes`,
        {
-          seasonId: seasonID,
+          params: {
+            seasonId: seasonID,
+          },
        }
      );

@@ -410,7 +414,7 @@ class JellyfinAPI extends ExternalAPI {
      ).AccessToken;
    } catch (e) {
      logger.error(
-        `Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
+        `Something went wrong while creating an API key from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );

--- a/server/api/plexapi.ts
+++ b/server/api/plexapi.ts
@@ -180,7 +180,7 @@ class PlexAPI {
      settings.plex.libraries = [];
    }

-    settings.save();
+    await settings.save();
  }

  public async getLibraryContents(
--- a/server/api/plextv.ts
+++ b/server/api/plextv.ts
@@ -1,9 +1,9 @@
-import ExternalAPI from '@server/api/externalapi';
 import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import xml2js from 'xml2js';
+import ExternalAPI from './externalapi';

 interface PlexAccountResponse {
  user: PlexUser;
@@ -137,6 +137,8 @@ class PlexTvAPI extends ExternalAPI {
      {
        headers: {
          'X-Plex-Token': authToken,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
        },
        nodeCache: cacheManager.getCache('plextv').data,
      }
@@ -147,11 +149,15 @@ class PlexTvAPI extends ExternalAPI {

  public async getDevices(): Promise<PlexDevice[]> {
    try {
-      const devicesResp = await this.get('/api/resources', {
-        includeHttps: '1',
-      });
+      const devicesResp = await this.axios.get(
+        '/api/resources?includeHttps=1',
+        {
+          transformResponse: [],
+          responseType: 'text',
+        }
+      );
      const parsedXml = await xml2js.parseStringPromise(
-        devicesResp as DeviceResponse
+        devicesResp.data as DeviceResponse
      );
      return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
        name: pxml.$.name,
@@ -199,11 +205,11 @@ class PlexTvAPI extends ExternalAPI {

  public async getUser(): Promise<PlexUser> {
    try {
-      const account = await this.get<PlexAccountResponse>(
+      const account = await this.axios.get<PlexAccountResponse>(
        '/users/account.json'
      );

-      return account.user;
+      return account.data.user;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from plex.tv: ${e.message}`,
@@ -243,10 +249,13 @@ class PlexTvAPI extends ExternalAPI {
  }

  public async getUsers(): Promise<UsersResponse> {
-    const data = await this.get('/api/users');
+    const response = await this.axios.get('/api/users', {
+      transformResponse: [],
+      responseType: 'text',
+    });

    const parsedXml = (await xml2js.parseStringPromise(
-      data as string
+      response.data
    )) as UsersResponse;
    return parsedXml;
  }
@@ -261,49 +270,49 @@ class PlexTvAPI extends ExternalAPI {
    items: PlexWatchlistItem[];
  }> {
    try {
-      const params = new URLSearchParams({
-        'X-Plex-Container-Start': offset.toString(),
-        'X-Plex-Container-Size': size.toString(),
-      });
-      const response = await this.fetch(
-        `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
+      const response = await this.axios.get<WatchlistResponse>(
+        '/library/sections/watchlist/all',
        {
-          headers: this.defaultHeaders,
+          params: {
+            'X-Plex-Container-Start': offset,
+            'X-Plex-Container-Size': size,
+          },
+          baseURL: 'https://metadata.provider.plex.tv',
        }
      );
-      const data = (await response.json()) as WatchlistResponse;

      const watchlistDetails = await Promise.all(
-        (data.MediaContainer.Metadata ?? []).map(async (watchlistItem) => {
-          const detailedResponse = await this.getRolling<MetadataResponse>(
-            `/library/metadata/${watchlistItem.ratingKey}`,
-            {},
-            undefined,
-            {},
-            'https://metadata.provider.plex.tv'
-          );
+        (response.data.MediaContainer.Metadata ?? []).map(
+          async (watchlistItem) => {
+            const detailedResponse = await this.getRolling<MetadataResponse>(
+              `/library/metadata/${watchlistItem.ratingKey}`,
+              {
+                baseURL: 'https://metadata.provider.plex.tv',
+              }
+            );

-          const metadata = detailedResponse.MediaContainer.Metadata[0];
+            const metadata = detailedResponse.MediaContainer.Metadata[0];

-          const tmdbString = metadata.Guid.find((guid) =>
-            guid.id.startsWith('tmdb')
-          );
-          const tvdbString = metadata.Guid.find((guid) =>
-            guid.id.startsWith('tvdb')
-          );
+            const tmdbString = metadata.Guid.find((guid) =>
+              guid.id.startsWith('tmdb')
+            );
+            const tvdbString = metadata.Guid.find((guid) =>
+              guid.id.startsWith('tvdb')
+            );

-          return {
-            ratingKey: metadata.ratingKey,
-            // This should always be set? But I guess it also cannot be?
-            // We will filter out the 0's afterwards
-            tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
-            tvdbId: tvdbString
-              ? Number(tvdbString.id.split('//')[1])
-              : undefined,
-            title: metadata.title,
-            type: metadata.type,
-          };
-        })
+            return {
+              ratingKey: metadata.ratingKey,
+              // This should always be set? But I guess it also cannot be?
+              // We will filter out the 0's afterwards
+              tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
+              tvdbId: tvdbString
+                ? Number(tvdbString.id.split('//')[1])
+                : undefined,
+              title: metadata.title,
+              type: metadata.type,
+            };
+          }
+        )
      );

      const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
@@ -311,7 +320,7 @@ class PlexTvAPI extends ExternalAPI {
      return {
        offset,
        size,
-        totalSize: data.MediaContainer.totalSize,
+        totalSize: response.data.MediaContainer.totalSize,
        items: filteredList,
      };
    } catch (e) {
--- a/server/api/pushover.ts
+++ b/server/api/pushover.ts
@@ -1,4 +1,4 @@
-import ExternalAPI from '@server/api/externalapi';
+import ExternalAPI from './externalapi';

 interface PushoverSoundsResponse {
  sounds: {
@@ -26,13 +26,24 @@ export const mapSounds = (sounds: {

 class PushoverAPI extends ExternalAPI {
  constructor() {
-    super('https://api.pushover.net/1');
+    super(
+      'https://api.pushover.net/1',
+      {},
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+      }
+    );
  }

  public async getSounds(appToken: string): Promise<PushoverSound[]> {
    try {
      const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
-        token: appToken,
+        params: {
+          token: appToken,
+        },
      });

      return mapSounds(data.sounds);
--- a/server/api/servarr/base.ts
+++ b/server/api/servarr/base.ts
@@ -160,7 +160,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
      const data = await this.get<QueueResponse<QueueItemAppendT>>(
        `/queue`,
        {
-          includeEpisode: 'true',
+          params: {
+            includeEpisode: 'true',
+          },
        },
        0
      );
--- a/server/api/servarr/radarr.ts
+++ b/server/api/servarr/radarr.ts
@@ -58,7 +58,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
  public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
    try {
      const data = await this.get<RadarrMovie[]>('/movie/lookup', {
-        term: `tmdb:${id}`,
+        params: {
+          term: `tmdb:${id}`,
+        },
      });

      if (!data[0]) {
@@ -222,8 +224,10 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
    try {
      const { id, title } = await this.getMovieByTmdbId(movieId);
      await this.delete(`/movie/${id}`, {
-        deleteFiles: 'true',
-        addImportExclusion: 'false',
+        params: {
+          deleteFiles: 'true',
+          addImportExclusion: 'false',
+        },
      });
      logger.info(`[Radarr] Removed movie ${title}`);
    } catch (e) {
--- a/server/api/servarr/sonarr.ts
+++ b/server/api/servarr/sonarr.ts
@@ -138,7 +138,9 @@ class SonarrAPI extends ServarrBase<{
  public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
    try {
      const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: title,
+        params: {
+          term: title,
+        },
      });

      if (!data[0]) {
@@ -159,7 +161,9 @@ class SonarrAPI extends ServarrBase<{
  public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
    try {
      const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: `tvdb:${id}`,
+        params: {
+          term: `tvdb:${id}`,
+        },
      });

      if (!data[0]) {
@@ -345,8 +349,10 @@ class SonarrAPI extends ServarrBase<{
    try {
      const { id, title } = await this.getSeriesByTvdbId(serieId);
      await this.delete(`/series/${id}`, {
-        deleteFiles: 'true',
-        addImportExclusion: 'false',
+        params: {
+          deleteFiles: 'true',
+          addImportExclusion: 'false',
+        },
      });
      logger.info(`[Radarr] Removed serie ${title}`);
    } catch (e) {
--- a/server/api/tautulli.ts
+++ b/server/api/tautulli.ts
@@ -1,7 +1,8 @@
-import ExternalAPI from '@server/api/externalapi';
 import type { User } from '@server/entity/User';
 import type { TautulliSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import type { AxiosInstance } from 'axios';
+import axios from 'axios';
 import { uniqWith } from 'lodash';

 export interface TautulliHistoryRecord {
@@ -112,25 +113,25 @@ interface TautulliInfoResponse {
  };
 }

-class TautulliAPI extends ExternalAPI {
+class TautulliAPI {
+  private axios: AxiosInstance;
+
  constructor(settings: TautulliSettings) {
-    super(
-      `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+    this.axios = axios.create({
+      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
        settings.port
      }${settings.urlBase ?? ''}`,
-      {
-        apikey: settings.apiKey || '',
-      }
-    );
+      params: { apikey: settings.apiKey },
+    });
  }

  public async getInfo(): Promise<TautulliInfo> {
    try {
      return (
-        await this.get<TautulliInfoResponse>('/api/v2', {
-          cmd: 'get_tautulli_info',
+        await this.axios.get<TautulliInfoResponse>('/api/v2', {
+          params: { cmd: 'get_tautulli_info' },
        })
-      ).response.data;
+      ).data.response.data;
    } catch (e) {
      logger.error('Something went wrong fetching Tautulli server info', {
        label: 'Tautulli API',
@@ -147,12 +148,14 @@ class TautulliAPI extends ExternalAPI {
  ): Promise<TautulliWatchStats[]> {
    try {
      return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_item_watch_time_stats',
-          rating_key: ratingKey,
-          grouping: '1',
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_watch_time_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
        })
-      ).response.data;
+      ).data.response.data;
    } catch (e) {
      logger.error(
        'Something went wrong fetching media watch stats from Tautulli',
@@ -173,12 +176,14 @@ class TautulliAPI extends ExternalAPI {
  ): Promise<TautulliWatchUser[]> {
    try {
      return (
-        await this.get<TautulliWatchUsersResponse>('/api/v2', {
-          cmd: 'get_item_user_stats',
-          rating_key: ratingKey,
-          grouping: '1',
+        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_user_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
        })
-      ).response.data;
+      ).data.response.data;
    } catch (e) {
      logger.error(
        'Something went wrong fetching media watch users from Tautulli',
@@ -201,13 +206,15 @@ class TautulliAPI extends ExternalAPI {
      }

      return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_user_watch_time_stats',
-          user_id: user.plexId.toString(),
-          query_days: '0',
-          grouping: '1',
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_user_watch_time_stats',
+            user_id: user.plexId,
+            query_days: 0,
+            grouping: 1,
+          },
        })
-      ).response.data[0];
+      ).data.response.data[0];
    } catch (e) {
      logger.error(
        'Something went wrong fetching user watch stats from Tautulli',
@@ -238,17 +245,19 @@ class TautulliAPI extends ExternalAPI {

      while (results.length < 20) {
        const tautulliData = (
-          await this.get<TautulliHistoryResponse>('/api/v2', {
-            cmd: 'get_history',
-            grouping: '1',
-            order_column: 'date',
-            order_dir: 'desc',
-            user_id: user.plexId.toString(),
-            media_type: 'movie,episode',
-            length: take.toString(),
-            start: start.toString(),
+          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
+            params: {
+              cmd: 'get_history',
+              grouping: 1,
+              order_column: 'date',
+              order_dir: 'desc',
+              user_id: user.plexId,
+              media_type: 'movie,episode',
+              length: take,
+              start,
+            },
          })
-        ).response.data.data;
+        ).data.response.data.data;

        if (!tautulliData.length) {
          return results;
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -112,10 +112,10 @@ class TheMovieDb extends ExternalAPI {
      },
      {
        nodeCache: cacheManager.getCache('tmdb').data,
-        rateLimit: {
-          maxRPS: 50,
-          id: 'tmdb',
-        },
+        // rateLimit: {
+        //   maxRPS: 50,
+        //   id: 'tmdb',
+        // },
      }
    );
    this.region = region;
@@ -130,10 +130,12 @@ class TheMovieDb extends ExternalAPI {
  }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
    try {
      const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
+        params: {
+          query,
+          page: page.toString(),
+          include_adult: includeAdult ? 'true' : 'false',
+          language,
+        },
      });

      return data;
@@ -156,11 +158,13 @@ class TheMovieDb extends ExternalAPI {
  }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
    try {
      const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        primary_release_year: year?.toString() || '',
+        params: {
+          query,
+          page: page.toString(),
+          include_adult: includeAdult ? 'true' : 'false',
+          language,
+          primary_release_year: year?.toString() || '',
+        },
      });

      return data;
@@ -183,11 +187,13 @@ class TheMovieDb extends ExternalAPI {
  }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
    try {
      const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        first_air_date_year: year?.toString() || '',
+        params: {
+          query,
+          page: page.toString(),
+          include_adult: includeAdult ? 'true' : 'false',
+          language,
+          first_air_date_year: year?.toString() || '',
+        },
      });

      return data;
@@ -210,7 +216,9 @@ class TheMovieDb extends ExternalAPI {
  }): Promise<TmdbPersonDetails> => {
    try {
      const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        language,
+        params: {
+          language,
+        },
      });

      return data;
@@ -230,7 +238,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbPersonCombinedCredits>(
        `/person/${personId}/combined_credits`,
        {
-          language,
+          params: {
+            language,
+          },
        }
      );

@@ -253,9 +263,11 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbMovieDetails>(
        `/movie/${movieId}`,
        {
-          language,
-          append_to_response:
-            'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          params: {
+            language,
+            append_to_response:
+              'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          },
        },
        43200
      );
@@ -277,9 +289,11 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbTvDetails>(
        `/tv/${tvId}`,
        {
-          language,
-          append_to_response:
-            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          params: {
+            language,
+            append_to_response:
+              'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          },
        },
        43200
      );
@@ -303,8 +317,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSeasonWithEpisodes>(
        `/tv/${tvId}/season/${seasonNumber}`,
        {
-          language: language || '',
-          append_to_response: 'external_ids',
+          params: {
+            language: language || '',
+            append_to_response: 'external_ids',
+          },
        }
      );

@@ -327,8 +343,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/movie/${movieId}/recommendations`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page: page.toString(),
+            language,
+          },
        }
      );

@@ -351,8 +369,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/movie/${movieId}/similar`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page: page.toString(),
+            language,
+          },
        }
      );

@@ -375,8 +395,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/keyword/${keywordId}/movies`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page: page.toString(),
+            language,
+          },
        }
      );

@@ -399,8 +421,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchTvResponse>(
        `/tv/${tvId}/recommendations`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page: page.toString(),
+            language,
+          },
        }
      );

@@ -423,8 +447,10 @@ class TheMovieDb extends ExternalAPI {
  }): Promise<TmdbSearchTvResponse> {
    try {
      const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        page: page.toString(),
-        language,
+        params: {
+          page: page.toString(),
+          language,
+        },
      });

      return data;
@@ -465,38 +491,40 @@ class TheMovieDb extends ExternalAPI {
        .split('T')[0];

      const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
-        sort_by: sortBy,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        region: this.region || '',
-        with_original_language:
-          originalLanguage && originalLanguage !== 'all'
-            ? originalLanguage
-            : originalLanguage === 'all'
-            ? ''
-            : this.originalLanguage || '',
-        // Set our release date values, but check if one is set and not the other,
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
-        'primary_release_date.gte':
-          !primaryReleaseDateGte && primaryReleaseDateLte
-            ? defaultPastDate
-            : primaryReleaseDateGte || '',
-        'primary_release_date.lte':
-          !primaryReleaseDateLte && primaryReleaseDateGte
-            ? defaultFutureDate
-            : primaryReleaseDateLte || '',
-        with_genres: genre || '',
-        with_companies: studio || '',
-        with_keywords: keywords || '',
-        'with_runtime.gte': withRuntimeGte || '',
-        'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.gte': voteAverageGte || '',
-        'vote_average.lte': voteAverageLte || '',
-        'vote_count.gte': voteCountGte || '',
-        'vote_count.lte': voteCountLte || '',
-        watch_region: watchRegion || '',
-        with_watch_providers: watchProviders || '',
+        params: {
+          sort_by: sortBy,
+          page: page.toString(),
+          include_adult: includeAdult ? 'true' : 'false',
+          language,
+          region: this.region || '',
+          with_original_language:
+            originalLanguage && originalLanguage !== 'all'
+              ? originalLanguage
+              : originalLanguage === 'all'
+              ? ''
+              : this.originalLanguage || '',
+          // Set our release date values, but check if one is set and not the other,
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          'primary_release_date.gte':
+            !primaryReleaseDateGte && primaryReleaseDateLte
+              ? defaultPastDate
+              : primaryReleaseDateGte || '',
+          'primary_release_date.lte':
+            !primaryReleaseDateLte && primaryReleaseDateGte
+              ? defaultFutureDate
+              : primaryReleaseDateLte || '',
+          with_genres: genre || '',
+          with_companies: studio || '',
+          with_keywords: keywords || '',
+          'with_runtime.gte': withRuntimeGte || '',
+          'with_runtime.lte': withRuntimeLte || '',
+          'vote_average.gte': voteAverageGte || '',
+          'vote_average.lte': voteAverageLte || '',
+          'vote_count.gte': voteCountGte || '',
+          'vote_count.lte': voteCountLte || '',
+          watch_region: watchRegion || '',
+          with_watch_providers: watchProviders || '',
+        },
      });

      return data;
@@ -538,41 +566,43 @@ class TheMovieDb extends ExternalAPI {
        .split('T')[0];

      const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
-        sort_by: sortBy,
-        page: page.toString(),
-        language,
-        region: this.region || '',
-        // Set our release date values, but check if one is set and not the other,
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
-        'first_air_date.gte':
-          !firstAirDateGte && firstAirDateLte
-            ? defaultPastDate
-            : firstAirDateGte || '',
-        'first_air_date.lte':
-          !firstAirDateLte && firstAirDateGte
-            ? defaultFutureDate
-            : firstAirDateLte || '',
-        with_original_language:
-          originalLanguage && originalLanguage !== 'all'
-            ? originalLanguage
-            : originalLanguage === 'all'
-            ? ''
-            : this.originalLanguage || '',
-        include_null_first_air_dates: includeEmptyReleaseDate
-          ? 'true'
-          : 'false',
-        with_genres: genre || '',
-        with_networks: network?.toString() || '',
-        with_keywords: keywords || '',
-        'with_runtime.gte': withRuntimeGte || '',
-        'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.gte': voteAverageGte || '',
-        'vote_average.lte': voteAverageLte || '',
-        'vote_count.gte': voteCountGte || '',
-        'vote_count.lte': voteCountLte || '',
-        with_watch_providers: watchProviders || '',
-        watch_region: watchRegion || '',
-        with_status: withStatus || '',
+        params: {
+          sort_by: sortBy,
+          page: page.toString(),
+          language,
+          region: this.region || '',
+          // Set our release date values, but check if one is set and not the other,
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          'first_air_date.gte':
+            !firstAirDateGte && firstAirDateLte
+              ? defaultPastDate
+              : firstAirDateGte || '',
+          'first_air_date.lte':
+            !firstAirDateLte && firstAirDateGte
+              ? defaultFutureDate
+              : firstAirDateLte || '',
+          with_original_language:
+            originalLanguage && originalLanguage !== 'all'
+              ? originalLanguage
+              : originalLanguage === 'all'
+              ? ''
+              : this.originalLanguage || '',
+          include_null_first_air_dates: includeEmptyReleaseDate
+            ? 'true'
+            : 'false',
+          with_genres: genre || '',
+          with_networks: network?.toString() || '',
+          with_keywords: keywords || '',
+          'with_runtime.gte': withRuntimeGte || '',
+          'with_runtime.lte': withRuntimeLte || '',
+          'vote_average.gte': voteAverageGte || '',
+          'vote_average.lte': voteAverageLte || '',
+          'vote_count.gte': voteCountGte || '',
+          'vote_count.lte': voteCountLte || '',
+          with_watch_providers: watchProviders || '',
+          watch_region: watchRegion || '',
+          with_status: withStatus || '',
+        },
      });

      return data;
@@ -592,10 +622,12 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbUpcomingMoviesResponse>(
        '/movie/upcoming',
        {
-          page: page.toString(),
-          language,
-          region: this.region || '',
-          originalLanguage: this.originalLanguage || '',
+          params: {
+            page: page.toString(),
+            language,
+            region: this.region || '',
+            originalLanguage: this.originalLanguage || '',
+          },
        }
      );

@@ -618,9 +650,11 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMultiResponse>(
        `/trending/all/${timeWindow}`,
        {
-          page: page.toString(),
-          language,
-          region: this.region || '',
+          params: {
+            page: page.toString(),
+            language,
+            region: this.region || '',
+          },
        }
      );

@@ -641,7 +675,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/trending/movie/${timeWindow}`,
        {
-          page: page.toString(),
+          params: {
+            page: page.toString(),
+          },
        }
      );

@@ -662,7 +698,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchTvResponse>(
        `/trending/tv/${timeWindow}`,
        {
-          page: page.toString(),
+          params: {
+            page: page.toString(),
+          },
        }
      );

@@ -691,8 +729,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbExternalIdResponse>(
        `/find/${externalId}`,
        {
-          external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
-          language,
+          params: {
+            external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+            language,
+          },
        }
      );

@@ -782,7 +822,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbCollection>(
        `/collection/${collectionId}`,
        {
-          language,
+          params: {
+            language,
+          },
        }
      );

@@ -855,7 +897,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbGenresResult>(
        '/genre/movie/list',
        {
-          language,
+          params: {
+            language,
+          },
        },
        86400 // 24 hours
      );
@@ -867,7 +911,9 @@ class TheMovieDb extends ExternalAPI {
        const englishData = await this.get<TmdbGenresResult>(
          '/genre/movie/list',
          {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
          },
          86400 // 24 hours
        );
@@ -902,7 +948,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbGenresResult>(
        '/genre/tv/list',
        {
-          language,
+          params: {
+            language,
+          },
        },
        86400 // 24 hours
      );
@@ -914,7 +962,9 @@ class TheMovieDb extends ExternalAPI {
        const englishData = await this.get<TmdbGenresResult>(
          '/genre/tv/list',
          {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
          },
          86400 // 24 hours
        );
@@ -969,8 +1019,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbKeywordSearchResponse>(
        '/search/keyword',
        {
-          query,
-          page: page.toString(),
+          params: {
+            query,
+            page: page.toString(),
+          },
        },
        86400 // 24 hours
      );
@@ -992,8 +1044,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbCompanySearchResponse>(
        '/search/company',
        {
-          query,
-          page: page.toString(),
+          params: {
+            query,
+            page: page.toString(),
+          },
        },
        86400 // 24 hours
      );
@@ -1013,7 +1067,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
        '/watch/providers/regions',
        {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
+            language: language ? this.originalLanguage || '' : '',
+          },
        },
        86400 // 24 hours
      );
@@ -1037,8 +1093,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
        '/watch/providers/movie',
        {
-          language: language ? this.originalLanguage || '' : '',
-          watch_region: watchRegion,
+          params: {
+            language: language ? this.originalLanguage || '' : '',
+            watch_region: watchRegion,
+          },
        },
        86400 // 24 hours
      );
@@ -1062,8 +1120,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
        '/watch/providers/tv',
        {
-          language: language ? this.originalLanguage || '' : '',
-          watch_region: watchRegion,
+          params: {
+            language: language ? this.originalLanguage || '' : '',
+            watch_region: watchRegion,
+          },
        },
        86400 // 24 hours
      );
--- a/server/index.ts
+++ b/server/index.ts
@@ -23,6 +23,7 @@ import avatarproxy from '@server/routes/avatarproxy';
 import imageproxy from '@server/routes/imageproxy';
 import { appDataPermissions } from '@server/utils/appDataVolume';
 import { getAppVersion } from '@server/utils/appVersion';
+import createCustomProxyAgent from '@server/utils/customProxyAgent';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
 import { TypeormStore } from 'connect-typeorm/out';
@@ -38,7 +39,6 @@ import dns from 'node:dns';
 import net from 'node:net';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
-import { ProxyAgent, setGlobalDispatcher } from 'undici';
 import YAML from 'yamljs';

 if (process.env.forceIpv4First === 'true') {
@@ -76,8 +76,8 @@ app
    restartFlag.initializeSettings(settings.main);

    // Register HTTP proxy
-    if (settings.main.httpProxy) {
-      setGlobalDispatcher(new ProxyAgent(settings.main.httpProxy));
+    if (settings.main.proxy.enabled) {
+      await createCustomProxyAgent(settings.main.proxy);
    }

    // Migrate library types
--- a/server/lib/scanners/plex/index.ts
+++ b/server/lib/scanners/plex/index.ts
@@ -129,7 +129,7 @@ class PlexScanner
          });

          settings.plex.libraries = newLibraries;
-          settings.save();
+          await settings.save();
        }
      } else {
        for (const library of this.libraries) {
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -2,7 +2,7 @@ import { MediaServerType } from '@server/constants/server';
 import { Permission } from '@server/lib/permissions';
 import { runMigrations } from '@server/lib/settings/migrator';
 import { randomUUID } from 'crypto';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { merge } from 'lodash';
 import path from 'path';
 import webpush from 'web-push';
@@ -99,6 +99,17 @@ interface Quota {
  quotaDays?: number;
 }

+export interface ProxySettings {
+  enabled: boolean;
+  hostname: string;
+  port: number;
+  useSsl: boolean;
+  user: string;
+  password: string;
+  bypassFilter: string;
+  bypassLocalAddresses: boolean;
+}
+
 export interface MainSettings {
  apiKey: string;
  applicationTitle: string;
@@ -119,7 +130,7 @@ export interface MainSettings {
  mediaServerType: number;
  partialRequestsEnabled: boolean;
  locale: string;
-  httpProxy: string;
+  proxy: ProxySettings;
 }

 interface PublicSettings {
@@ -326,7 +337,16 @@ class Settings {
        mediaServerType: MediaServerType.NOT_CONFIGURED,
        partialRequestsEnabled: true,
        locale: 'en',
-        httpProxy: '',
+        proxy: {
+          enabled: false,
+          hostname: '',
+          port: 8080,
+          useSsl: false,
+          user: '',
+          password: '',
+          bypassFilter: '',
+          bypassLocalAddresses: true,
+        },
      },
      plex: {
        name: '',
@@ -481,10 +501,6 @@ class Settings {
  }

  get main(): MainSettings {
-    if (!this.data.main.apiKey) {
-      this.data.main.apiKey = this.generateApiKey();
-      this.save();
-    }
    return this.data.main;
  }

@@ -586,29 +602,20 @@ class Settings {
  }

  get clientId(): string {
-    if (!this.data.clientId) {
-      this.data.clientId = randomUUID();
-      this.save();
-    }
-
    return this.data.clientId;
  }

  get vapidPublic(): string {
-    this.generateVapidKeys();
-
    return this.data.vapidPublic;
  }

  get vapidPrivate(): string {
-    this.generateVapidKeys();
-
    return this.data.vapidPrivate;
  }

-  public regenerateApiKey(): MainSettings {
+  public async regenerateApiKey(): Promise<MainSettings> {
    this.main.apiKey = this.generateApiKey();
-    this.save();
+    await this.save();
    return this.main;
  }

@@ -620,15 +627,6 @@ class Settings {
    }
  }

-  private generateVapidKeys(force = false): void {
-    if (!this.data.vapidPublic || !this.data.vapidPrivate || force) {
-      const vapidKeys = webpush.generateVAPIDKeys();
-      this.data.vapidPrivate = vapidKeys.privateKey;
-      this.data.vapidPublic = vapidKeys.publicKey;
-      this.save();
-    }
-  }
-
  /**
   * Settings Load
   *
@@ -643,30 +641,51 @@ class Settings {
      return this;
    }

-    if (!fs.existsSync(SETTINGS_PATH)) {
-      this.save();
+    let data;
+    try {
+      data = await fs.readFile(SETTINGS_PATH, 'utf-8');
+    } catch {
+      await this.save();
    }
-    const data = fs.readFileSync(SETTINGS_PATH, 'utf-8');

    if (data) {
      const parsedJson = JSON.parse(data);
-      this.data = await runMigrations(parsedJson, SETTINGS_PATH);
-
-      this.data = merge(this.data, parsedJson);
-
-      if (process.env.API_KEY) {
-        if (this.main.apiKey != process.env.API_KEY) {
-          this.main.apiKey = process.env.API_KEY;
-        }
-      }
-
-      this.save();
+      const migratedData = await runMigrations(parsedJson, SETTINGS_PATH);
+      this.data = merge(this.data, migratedData);
    }
+
+    // generate keys and ids if it's missing
+    let change = false;
+    if (!this.data.main.apiKey) {
+      this.data.main.apiKey = this.generateApiKey();
+      change = true;
+    } else if (process.env.API_KEY) {
+      if (this.main.apiKey != process.env.API_KEY) {
+        this.main.apiKey = process.env.API_KEY;
+      }
+    }
+    if (!this.data.clientId) {
+      this.data.clientId = randomUUID();
+      change = true;
+    }
+    if (!this.data.vapidPublic || !this.data.vapidPrivate) {
+      const vapidKeys = webpush.generateVAPIDKeys();
+      this.data.vapidPrivate = vapidKeys.privateKey;
+      this.data.vapidPublic = vapidKeys.publicKey;
+      change = true;
+    }
+    if (change) {
+      await this.save();
+    }
+
    return this;
  }

-  public save(): void {
-    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(this.data, undefined, ' '));
+  public async save(): Promise<void> {
+    await fs.writeFile(
+      SETTINGS_PATH,
+      JSON.stringify(this.data, undefined, ' ')
+    );
  }
 }

--- a/server/lib/settings/migrations/0001_migrate_hostname.ts
+++ b/server/lib/settings/migrations/0001_migrate_hostname.ts
@@ -1,15 +1,14 @@
 import type { AllSettings } from '@server/lib/settings';

 const migrateHostname = (settings: any): AllSettings => {
-  const oldJellyfinSettings = settings.jellyfin;
-  if (oldJellyfinSettings && oldJellyfinSettings.hostname) {
-    const { hostname } = oldJellyfinSettings;
+  if (settings.jellyfin?.hostname) {
+    const { hostname } = settings.jellyfin;
    const protocolMatch = hostname.match(/^(https?):\/\//i);
    const useSsl = protocolMatch && protocolMatch[1].toLowerCase() === 'https';
    const remainingUrl = hostname.replace(/^(https?):\/\//i, '');
    const urlMatch = remainingUrl.match(/^([^:]+)(:([0-9]+))?(\/.*)?$/);

-    delete oldJellyfinSettings.hostname;
+    delete settings.jellyfin.hostname;
    if (urlMatch) {
      const [, ip, , port, urlBase] = urlMatch;
      settings.jellyfin = {
@@ -21,9 +20,7 @@ const migrateHostname = (settings: any): AllSettings => {
      };
    }
  }
-  if (settings.jellyfin && settings.jellyfin.hostname) {
-    delete settings.jellyfin.hostname;
-  }
+
  return settings;
 };

--- a/server/lib/settings/migrations/0002_migrate_apitokens.ts
+++ b/server/lib/settings/migrations/0002_migrate_apitokens.ts
@@ -27,8 +27,14 @@ const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
      admin.jellyfinDeviceId
    );
    jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-    settings.jellyfin.apiKey = apiKey;
+    try {
+      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
+      settings.jellyfin.apiKey = apiKey;
+    } catch {
+      throw new Error(
+        "Failed to create Jellyfin API token from admin account. Please check your network configuration or edit your settings.json by adding an 'apiKey' field inside of the 'jellyfin' section to fix this issue."
+      );
+    }
  }
  return settings;
 };
--- a/server/lib/settings/migrator.ts
+++ b/server/lib/settings/migrator.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import type { AllSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import fs from 'fs/promises';
@@ -15,9 +14,9 @@ export const runMigrations = async (
  try {
    // we read old backup and create a backup of currents settings
    const BACKUP_PATH = SETTINGS_PATH.replace('.json', '.old.json');
-    let oldBackup: Buffer | null = null;
+    let oldBackup: string | null = null;
    try {
-      oldBackup = await fs.readFile(BACKUP_PATH);
+      oldBackup = await fs.readFile(BACKUP_PATH, 'utf-8');
    } catch {
      /* empty */
    }
@@ -37,7 +36,7 @@ export const runMigrations = async (
        const { default: migrationFn } = await import(
          path.join(migrationsDir, migration)
        );
-        const newSettings = await migrationFn(migrated);
+        const newSettings = await migrationFn(structuredClone(migrated));
        if (JSON.stringify(migrated) !== JSON.stringify(newSettings)) {
          logger.debug(`Migration '${migration}' has been applied.`, {
            label: 'Settings Migrator',
@@ -45,10 +44,20 @@ export const runMigrations = async (
        }
        migrated = newSettings;
      } catch (e) {
-        logger.error(`Error while running migration '${migration}'`, {
-          label: 'Settings Migrator',
-        });
-        throw e;
+        // we stop jellyseerr if the migration failed
+        logger.error(
+          `Error while running migration '${migration}': ${e.message}`,
+          {
+            label: 'Settings Migrator',
+          }
+        );
+        logger.error(
+          'A common cause for this error is a permission issue with your configuration folder, a network issue or a corrupted database.',
+          {
+            label: 'Settings Migrator',
+          }
+        );
+        process.exit();
      }
    }

@@ -72,22 +81,18 @@ export const runMigrations = async (
      await fs.writeFile(BACKUP_PATH, oldBackup.toString());
    }
  } catch (e) {
+    // we stop jellyseerr if the migration failed
    logger.error(
      `Something went wrong while running settings migrations: ${e.message}`,
-      { label: 'Settings Migrator' }
+      {
+        label: 'Settings Migrator',
+      }
    );
-    // we stop jellyseerr if the migration failed
-    console.log(
-      '===================================================================='
-    );
-    console.log(
-      '       SOMETHING WENT WRONG WHILE RUNNING SETTINGS MIGRATIONS       '
-    );
-    console.log(
-      '   Please check that your configuration folder is properly set up   '
-    );
-    console.log(
-      '===================================================================='
+    logger.error(
+      'A common cause for this issue is a permission error of your configuration folder.',
+      {
+        label: 'Settings Migrator',
+      }
    );
    process.exit();
  }
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -87,7 +87,7 @@ authRoutes.post('/plex', async (req, res, next) => {
      });

      settings.main.mediaServerType = MediaServerType.PLEX;
-      settings.save();
+      await settings.save();
      startJobs();

      await userRepository.save(user);
@@ -299,54 +299,84 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      where: { jellyfinUserId: account.User.Id },
    });

-    if (!user && !(await userRepository.count())) {
+    const missingAdminUser = !user && !(await userRepository.count());
+    if (
+      missingAdminUser ||
+      settings.main.mediaServerType === MediaServerType.NOT_CONFIGURED
+    ) {
      // Check if user is admin on jellyfin
      if (account.User.Policy.IsAdministrator === false) {
        throw new ApiError(403, ApiErrorCode.NotAdmin);
      }

-      logger.info(
-        'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Overseerr',
-        {
-          label: 'API',
-          ip: req.ip,
+      if (
+        body.serverType !== MediaServerType.JELLYFIN &&
+        body.serverType !== MediaServerType.EMBY
+      ) {
+        throw new Error('select_server_type');
+      }
+      settings.main.mediaServerType = body.serverType;
+
+      if (missingAdminUser) {
+        logger.info(
+          'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Jellyseerr',
+          {
+            label: 'API',
+            ip: req.ip,
+            jellyfinUsername: account.User.Name,
+          }
+        );
+
+        // User doesn't exist, and there are no users in the database, we'll create the user
+        // with admin permissions
+
+        user = new User({
+          id: 1,
+          email: body.email || account.User.Name,
          jellyfinUsername: account.User.Name,
+          jellyfinUserId: account.User.Id,
+          jellyfinDeviceId: deviceId,
+          jellyfinAuthToken: account.AccessToken,
+          permissions: Permission.ADMIN,
+          avatar: `/avatarproxy/${account.User.Id}`,
+          userType:
+            body.serverType === MediaServerType.JELLYFIN
+              ? UserType.JELLYFIN
+              : UserType.EMBY,
+        });
+
+        await userRepository.save(user);
+      } else {
+        logger.info(
+          'Sign-in attempt from Jellyfin user with access to the media server; editing admin user for Jellyseerr',
+          {
+            label: 'API',
+            ip: req.ip,
+            jellyfinUsername: account.User.Name,
+          }
+        );
+
+        // User alread exist but settings.json is not configured, we'll edit the admin user
+
+        user = await userRepository.findOne({
+          where: { id: 1 },
+        });
+        if (!user) {
+          throw new Error('Unable to find admin user to edit');
        }
-      );
+        user.email = body.email || account.User.Name;
+        user.jellyfinUsername = account.User.Name;
+        user.jellyfinUserId = account.User.Id;
+        user.jellyfinDeviceId = deviceId;
+        user.jellyfinAuthToken = account.AccessToken;
+        user.permissions = Permission.ADMIN;
+        user.avatar = `/avatarproxy/${account.User.Id}`;
+        user.userType =
+          body.serverType === MediaServerType.JELLYFIN
+            ? UserType.JELLYFIN
+            : UserType.EMBY;

-      // User doesn't exist, and there are no users in the database, we'll create the user
-      // with admin permissions
-      switch (body.serverType) {
-        case MediaServerType.EMBY:
-          settings.main.mediaServerType = MediaServerType.EMBY;
-          user = new User({
-            email: body.email || account.User.Name,
-            jellyfinUsername: account.User.Name,
-            jellyfinUserId: account.User.Id,
-            jellyfinDeviceId: deviceId,
-            jellyfinAuthToken: account.AccessToken,
-            permissions: Permission.ADMIN,
-            avatar: `/avatarproxy/${account.User.Id}`,
-            userType: UserType.EMBY,
-          });
-
-          break;
-        case MediaServerType.JELLYFIN:
-          settings.main.mediaServerType = MediaServerType.JELLYFIN;
-          user = new User({
-            email: body.email || account.User.Name,
-            jellyfinUsername: account.User.Name,
-            jellyfinUserId: account.User.Id,
-            jellyfinDeviceId: deviceId,
-            jellyfinAuthToken: account.AccessToken,
-            permissions: Permission.ADMIN,
-            avatar: `/avatarproxy/${account.User.Id}`,
-            userType: UserType.JELLYFIN,
-          });
-
-          break;
-        default:
-          throw new Error('select_server_type');
+        await userRepository.save(user);
      }

      // Create an API key on Jellyfin from this admin user
@@ -366,10 +396,8 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      settings.jellyfin.urlBase = body.urlBase ?? '';
      settings.jellyfin.useSsl = body.useSsl ?? false;
      settings.jellyfin.apiKey = apiKey;
-      settings.save();
+      await settings.save();
      startJobs();
-
-      await userRepository.save(user);
    }
    // User already exists, let's update their information
    else if (account.User.Id === user?.jellyfinUserId) {
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -69,19 +69,19 @@ settingsRoutes.get('/main', (req, res, next) => {
  res.status(200).json(filteredMainSettings(req.user, settings.main));
 });

-settingsRoutes.post('/main', (req, res) => {
+settingsRoutes.post('/main', async (req, res) => {
  const settings = getSettings();

  settings.main = merge(settings.main, req.body);
-  settings.save();
+  await settings.save();

  return res.status(200).json(settings.main);
 });

-settingsRoutes.post('/main/regenerate', (req, res, next) => {
+settingsRoutes.post('/main/regenerate', async (req, res, next) => {
  const settings = getSettings();

-  const main = settings.regenerateApiKey();
+  const main = await settings.regenerateApiKey();

  if (!req.user) {
    return next({ status: 500, message: 'User missing from request.' });
@@ -118,7 +118,7 @@ settingsRoutes.post('/plex', async (req, res, next) => {
    settings.plex.machineId = result.MediaContainer.machineIdentifier;
    settings.plex.name = result.MediaContainer.friendlyName;

-    settings.save();
+    await settings.save();
  } catch (e) {
    logger.error('Something went wrong testing Plex connection', {
      label: 'API',
@@ -231,7 +231,7 @@ settingsRoutes.get('/plex/library', async (req, res) => {
    ...library,
    enabled: enabledLibraries.includes(library.id),
  }));
-  settings.save();
+  await settings.save();
  return res.status(200).json(settings.plex.libraries);
 });

@@ -282,7 +282,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
    Object.assign(settings.jellyfin, req.body);
    settings.jellyfin.serverId = result.Id;
    settings.jellyfin.name = result.ServerName;
-    settings.save();
+    await settings.save();
  } catch (e) {
    if (e instanceof ApiError) {
      logger.error('Something went wrong testing Jellyfin connection', {
@@ -370,7 +370,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
    ...library,
    enabled: enabledLibraries.includes(library.id),
  }));
-  settings.save();
+  await settings.save();
  return res.status(200).json(settings.jellyfin.libraries);
 });

@@ -434,7 +434,7 @@ settingsRoutes.post('/tautulli', async (req, res, next) => {
        throw new Error('Tautulli version not supported');
      }

-      settings.save();
+      await settings.save();
    } catch (e) {
      logger.error('Something went wrong testing Tautulli connection', {
        label: 'API',
@@ -695,7 +695,7 @@ settingsRoutes.post<{ jobId: JobId }>(

 settingsRoutes.post<{ jobId: JobId }>(
  '/jobs/:jobId/schedule',
-  (req, res, next) => {
+  async (req, res, next) => {
    const scheduledJob = scheduledJobs.find(
      (job) => job.id === req.params.jobId
    );
@@ -709,7 +709,7 @@ settingsRoutes.post<{ jobId: JobId }>(

    if (result) {
      settings.jobs[scheduledJob.id].schedule = req.body.schedule;
-      settings.save();
+      await settings.save();

      scheduledJob.cronSchedule = req.body.schedule;

@@ -766,11 +766,11 @@ settingsRoutes.post<{ cacheId: AvailableCacheIds }>(
 settingsRoutes.post(
  '/initialize',
  isAuthenticated(Permission.ADMIN),
-  (_req, res) => {
+  async (_req, res) => {
    const settings = getSettings();

    settings.public.initialized = true;
-    settings.save();
+    await settings.save();

    return res.status(200).json(settings.public);
  }
--- a/server/routes/settings/notifications.ts
+++ b/server/routes/settings/notifications.ts
@@ -31,11 +31,11 @@ notificationRoutes.get('/discord', (_req, res) => {
  res.status(200).json(settings.notifications.agents.discord);
 });

-notificationRoutes.post('/discord', (req, res) => {
+notificationRoutes.post('/discord', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.discord = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.discord);
 });
@@ -65,11 +65,11 @@ notificationRoutes.get('/slack', (_req, res) => {
  res.status(200).json(settings.notifications.agents.slack);
 });

-notificationRoutes.post('/slack', (req, res) => {
+notificationRoutes.post('/slack', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.slack = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.slack);
 });
@@ -99,11 +99,11 @@ notificationRoutes.get('/telegram', (_req, res) => {
  res.status(200).json(settings.notifications.agents.telegram);
 });

-notificationRoutes.post('/telegram', (req, res) => {
+notificationRoutes.post('/telegram', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.telegram = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.telegram);
 });
@@ -133,11 +133,11 @@ notificationRoutes.get('/pushbullet', (_req, res) => {
  res.status(200).json(settings.notifications.agents.pushbullet);
 });

-notificationRoutes.post('/pushbullet', (req, res) => {
+notificationRoutes.post('/pushbullet', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.pushbullet = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.pushbullet);
 });
@@ -167,11 +167,11 @@ notificationRoutes.get('/pushover', (_req, res) => {
  res.status(200).json(settings.notifications.agents.pushover);
 });

-notificationRoutes.post('/pushover', (req, res) => {
+notificationRoutes.post('/pushover', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.pushover = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.pushover);
 });
@@ -201,11 +201,11 @@ notificationRoutes.get('/email', (_req, res) => {
  res.status(200).json(settings.notifications.agents.email);
 });

-notificationRoutes.post('/email', (req, res) => {
+notificationRoutes.post('/email', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.email = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.email);
 });
@@ -235,11 +235,11 @@ notificationRoutes.get('/webpush', (_req, res) => {
  res.status(200).json(settings.notifications.agents.webpush);
 });

-notificationRoutes.post('/webpush', (req, res) => {
+notificationRoutes.post('/webpush', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.webpush = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.webpush);
 });
@@ -284,7 +284,7 @@ notificationRoutes.get('/webhook', (_req, res) => {
  res.status(200).json(response);
 });

-notificationRoutes.post('/webhook', (req, res, next) => {
+notificationRoutes.post('/webhook', async (req, res, next) => {
  const settings = getSettings();
  try {
    JSON.parse(req.body.options.jsonPayload);
@@ -300,7 +300,7 @@ notificationRoutes.post('/webhook', (req, res, next) => {
        authHeader: req.body.options.authHeader,
      },
    };
-    settings.save();
+    await settings.save();

    res.status(200).json(settings.notifications.agents.webhook);
  } catch (e) {
@@ -351,11 +351,11 @@ notificationRoutes.get('/lunasea', (_req, res) => {
  res.status(200).json(settings.notifications.agents.lunasea);
 });

-notificationRoutes.post('/lunasea', (req, res) => {
+notificationRoutes.post('/lunasea', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.lunasea = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.lunasea);
 });
@@ -385,11 +385,11 @@ notificationRoutes.get('/gotify', (_req, res) => {
  res.status(200).json(settings.notifications.agents.gotify);
 });

-notificationRoutes.post('/gotify', (req, res) => {
+notificationRoutes.post('/gotify', async (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.gotify = req.body;
-  settings.save();
+  await settings.save();

  res.status(200).json(settings.notifications.agents.gotify);
 });
--- a/server/routes/settings/radarr.ts
+++ b/server/routes/settings/radarr.ts
@@ -12,7 +12,7 @@ radarrRoutes.get('/', (_req, res) => {
  res.status(200).json(settings.radarr);
 });

-radarrRoutes.post('/', (req, res) => {
+radarrRoutes.post('/', async (req, res) => {
  const settings = getSettings();

  const newRadarr = req.body as RadarrSettings;
@@ -31,7 +31,7 @@ radarrRoutes.post('/', (req, res) => {
  }

  settings.radarr = [...settings.radarr, newRadarr];
-  settings.save();
+  await settings.save();

  return res.status(201).json(newRadarr);
 });
@@ -76,7 +76,7 @@ radarrRoutes.post<

 radarrRoutes.put<{ id: string }, RadarrSettings, RadarrSettings>(
  '/:id',
-  (req, res, next) => {
+  async (req, res, next) => {
    const settings = getSettings();

    const radarrIndex = settings.radarr.findIndex(
@@ -102,7 +102,7 @@ radarrRoutes.put<{ id: string }, RadarrSettings, RadarrSettings>(
      ...req.body,
      id: Number(req.params.id),
    } as RadarrSettings;
-    settings.save();
+    await settings.save();

    return res.status(200).json(settings.radarr[radarrIndex]);
  }
@@ -134,7 +134,7 @@ radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res, next) => {
  );
 });

-radarrRoutes.delete<{ id: string }>('/:id', (req, res, next) => {
+radarrRoutes.delete<{ id: string }>('/:id', async (req, res, next) => {
  const settings = getSettings();

  const radarrIndex = settings.radarr.findIndex(
@@ -146,7 +146,7 @@ radarrRoutes.delete<{ id: string }>('/:id', (req, res, next) => {
  }

  const removed = settings.radarr.splice(radarrIndex, 1);
-  settings.save();
+  await settings.save();

  return res.status(200).json(removed[0]);
 });
--- a/server/routes/settings/sonarr.ts
+++ b/server/routes/settings/sonarr.ts
@@ -12,7 +12,7 @@ sonarrRoutes.get('/', (_req, res) => {
  res.status(200).json(settings.sonarr);
 });

-sonarrRoutes.post('/', (req, res) => {
+sonarrRoutes.post('/', async (req, res) => {
  const settings = getSettings();

  const newSonarr = req.body as SonarrSettings;
@@ -31,7 +31,7 @@ sonarrRoutes.post('/', (req, res) => {
  }

  settings.sonarr = [...settings.sonarr, newSonarr];
-  settings.save();
+  await settings.save();

  return res.status(201).json(newSonarr);
 });
@@ -73,7 +73,7 @@ sonarrRoutes.post('/test', async (req, res, next) => {
  }
 });

-sonarrRoutes.put<{ id: string }>('/:id', (req, res) => {
+sonarrRoutes.put<{ id: string }>('/:id', async (req, res) => {
  const settings = getSettings();

  const sonarrIndex = settings.sonarr.findIndex(
@@ -101,12 +101,12 @@ sonarrRoutes.put<{ id: string }>('/:id', (req, res) => {
    ...req.body,
    id: Number(req.params.id),
  } as SonarrSettings;
-  settings.save();
+  await settings.save();

  return res.status(200).json(settings.sonarr[sonarrIndex]);
 });

-sonarrRoutes.delete<{ id: string }>('/:id', (req, res) => {
+sonarrRoutes.delete<{ id: string }>('/:id', async (req, res) => {
  const settings = getSettings();

  const sonarrIndex = settings.sonarr.findIndex(
@@ -120,7 +120,7 @@ sonarrRoutes.delete<{ id: string }>('/:id', (req, res) => {
  }

  const removed = settings.sonarr.splice(sonarrIndex, 1);
-  settings.save();
+  await settings.save();

  return res.status(200).json(removed[0]);
 });
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -0,0 +1,111 @@
+import type { ProxySettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import type { Dispatcher } from 'undici';
+import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';
+
+export default async function createCustomProxyAgent(
+  proxySettings: ProxySettings
+) {
+  const defaultAgent = new Agent();
+
+  const skipUrl = (url: string) => {
+    const hostname = new URL(url).hostname;
+
+    if (proxySettings.bypassLocalAddresses && isLocalAddress(hostname)) {
+      return true;
+    }
+
+    for (const address of proxySettings.bypassFilter.split(',')) {
+      const trimmedAddress = address.trim();
+      if (!trimmedAddress) {
+        continue;
+      }
+
+      if (trimmedAddress.startsWith('*')) {
+        const domain = trimmedAddress.slice(1);
+        if (hostname.endsWith(domain)) {
+          return true;
+        }
+      } else if (hostname === trimmedAddress) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+  const noProxyInterceptor = (
+    dispatch: Dispatcher['dispatch']
+  ): Dispatcher['dispatch'] => {
+    return (opts, handler) => {
+      const url = opts.origin?.toString();
+      return url && skipUrl(url)
+        ? defaultAgent.dispatch(opts, handler)
+        : dispatch(opts, handler);
+    };
+  };
+
+  const token =
+    proxySettings.user && proxySettings.password
+      ? `Basic ${Buffer.from(
+          `${proxySettings.user}:${proxySettings.password}`
+        ).toString('base64')}`
+      : undefined;
+
+  try {
+    const proxyAgent = new ProxyAgent({
+      uri:
+        (proxySettings.useSsl ? 'https://' : 'http://') +
+        proxySettings.hostname +
+        ':' +
+        proxySettings.port,
+      token,
+      interceptors: {
+        Client: [noProxyInterceptor],
+      },
+    });
+
+    setGlobalDispatcher(proxyAgent);
+  } catch (e) {
+    logger.error('Failed to connect to the proxy: ' + e.message, {
+      label: 'Proxy',
+    });
+    setGlobalDispatcher(defaultAgent);
+    return;
+  }
+
+  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);
+    }
+  } catch (e) {
+    logger.error(
+      'Failed to connect to the proxy: ' + e.message + ': ' + e.cause,
+      { label: 'Proxy' }
+    );
+    setGlobalDispatcher(defaultAgent);
+  }
+}
+
+function isLocalAddress(hostname: string) {
+  if (hostname === 'localhost' || hostname === '127.0.0.1') {
+    return true;
+  }
+
+  const privateIpRanges = [
+    /^10\./, // 10.x.x.x
+    /^172\.(1[6-9]|2[0-9]|3[0-1])\./, // 172.16.x.x - 172.31.x.x
+    /^192\.168\./, // 192.168.x.x
+  ];
+  if (privateIpRanges.some((regex) => regex.test(hostname))) {
+    return true;
+  }
+
+  return false;
+}
--- a/server/utils/restartFlag.ts
+++ b/server/utils/restartFlag.ts
@@ -14,7 +14,7 @@ class RestartFlag {
    return (
      this.settings.csrfProtection !== settings.csrfProtection ||
      this.settings.trustProxy !== settings.trustProxy ||
-      this.settings.httpProxy !== settings.httpProxy
+      this.settings.proxy.enabled !== settings.proxy.enabled
    );
  }
 }
--- a/src/components/Settings/SettingsMain/index.tsx
+++ b/src/components/Settings/SettingsMain/index.tsx
@@ -55,8 +55,17 @@ const messages = defineMessages('components.Settings.SettingsMain', {
  validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
  partialRequestsEnabled: 'Allow Partial Series Requests',
  locale: 'Display Language',
-  httpProxy: 'HTTP Proxy',
-  httpProxyTip: 'Tooltip to write',
+  proxyEnabled: 'HTTP(S) Proxy',
+  proxyHostname: 'Proxy Hostname',
+  proxyPort: 'Proxy Port',
+  proxySsl: 'Use SSL For Proxy',
+  proxyUser: 'Proxy Username',
+  proxyPassword: 'Proxy Password',
+  proxyBypassFilter: 'Proxy Ignored Addresses',
+  proxyBypassFilterTip:
+    "Use ',' as a separator, and '*.' as a wildcard for subdomains",
+  proxyBypassLocalAddresses: 'Bypass Proxy for Local Addresses',
+  validationProxyPort: 'You must provide a valid port',
 });

 const SettingsMain = () => {
@@ -84,9 +93,12 @@ const SettingsMain = () => {
        intl.formatMessage(messages.validationApplicationUrlTrailingSlash),
        (value) => !value || !value.endsWith('/')
      ),
-    httpProxy: Yup.string().url(
-      intl.formatMessage(messages.validationApplicationUrl)
-    ),
+    proxyPort: Yup.number().when('proxyEnabled', {
+      is: (proxyEnabled: boolean) => proxyEnabled,
+      then: Yup.number().required(
+        intl.formatMessage(messages.validationProxyPort)
+      ),
+    }),
  });

  const regenerate = async () => {
@@ -142,7 +154,14 @@ const SettingsMain = () => {
            partialRequestsEnabled: data?.partialRequestsEnabled,
            trustProxy: data?.trustProxy,
            cacheImages: data?.cacheImages,
-            httpProxy: data?.httpProxy,
+            proxyEnabled: data?.proxy?.enabled,
+            proxyHostname: data?.proxy?.hostname,
+            proxyPort: data?.proxy?.port,
+            proxySsl: data?.proxy?.useSsl,
+            proxyUser: data?.proxy?.user,
+            proxyPassword: data?.proxy?.password,
+            proxyBypassFilter: data?.proxy?.bypassFilter,
+            proxyBypassLocalAddresses: data?.proxy?.bypassLocalAddresses,
          }}
          enableReinitialize
          validationSchema={MainSettingsSchema}
@@ -164,7 +183,16 @@ const SettingsMain = () => {
                  partialRequestsEnabled: values.partialRequestsEnabled,
                  trustProxy: values.trustProxy,
                  cacheImages: values.cacheImages,
-                  httpProxy: values.httpProxy,
+                  proxy: {
+                    enabled: values.proxyEnabled,
+                    hostname: values.proxyHostname,
+                    port: values.proxyPort,
+                    useSsl: values.proxySsl,
+                    user: values.proxyUser,
+                    password: values.proxyPassword,
+                    bypassFilter: values.proxyBypassFilter,
+                    bypassLocalAddresses: values.proxyBypassLocalAddresses,
+                  },
                }),
              });
              if (!res.ok) throw new Error();
@@ -445,27 +473,175 @@ const SettingsMain = () => {
                  </div>
                </div>
                <div className="form-row">
-                  <label htmlFor="httpProxy" className="checkbox-label">
+                  <label htmlFor="proxyEnabled" className="checkbox-label">
                    <span className="mr-2">
-                      {intl.formatMessage(messages.httpProxy)}
+                      {intl.formatMessage(messages.proxyEnabled)}
                    </span>
                    <SettingsBadge badgeType="advanced" className="mr-2" />
                    <SettingsBadge badgeType="restartRequired" />
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.httpProxyTip)}
-                    </span>
                  </label>
                  <div className="form-input-area">
-                    <div className="form-input-field">
-                      <Field id="httpProxy" name="httpProxy" type="text" />
-                    </div>
-                    {errors.httpProxy &&
-                      touched.httpProxy &&
-                      typeof errors.httpProxy === 'string' && (
-                        <div className="error">{errors.httpProxy}</div>
-                      )}
+                    <Field
+                      type="checkbox"
+                      id="proxyEnabled"
+                      name="proxyEnabled"
+                      onChange={() => {
+                        setFieldValue('proxyEnabled', !values.proxyEnabled);
+                      }}
+                    />
                  </div>
                </div>
+                {values.proxyEnabled && (
+                  <>
+                    <div className="form-row">
+                      <label htmlFor="proxyHostname" className="checkbox-label">
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(messages.proxyHostname)}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <div className="form-input-field">
+                          <Field
+                            id="proxyHostname"
+                            name="proxyHostname"
+                            type="text"
+                          />
+                        </div>
+                        {errors.proxyHostname &&
+                          touched.proxyHostname &&
+                          typeof errors.proxyHostname === 'string' && (
+                            <div className="error">{errors.proxyHostname}</div>
+                          )}
+                      </div>
+                    </div>
+                    <div className="form-row">
+                      <label htmlFor="proxyPort" className="checkbox-label">
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(messages.proxyPort)}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <div className="form-input-field">
+                          <Field id="proxyPort" name="proxyPort" type="text" />
+                        </div>
+                        {errors.proxyPort &&
+                          touched.proxyPort &&
+                          typeof errors.proxyPort === 'string' && (
+                            <div className="error">{errors.proxyPort}</div>
+                          )}
+                      </div>
+                    </div>
+                    <div className="form-row">
+                      <label htmlFor="proxySsl" className="checkbox-label">
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(messages.proxySsl)}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <Field
+                          type="checkbox"
+                          id="proxySsl"
+                          name="proxySsl"
+                          onChange={() => {
+                            setFieldValue('proxySsl', !values.proxySsl);
+                          }}
+                        />
+                      </div>
+                    </div>
+                    <div className="form-row">
+                      <label htmlFor="proxyUser" className="checkbox-label">
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(messages.proxyUser)}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <div className="form-input-field">
+                          <Field id="proxyUser" name="proxyUser" type="text" />
+                        </div>
+                        {errors.proxyUser &&
+                          touched.proxyUser &&
+                          typeof errors.proxyUser === 'string' && (
+                            <div className="error">{errors.proxyUser}</div>
+                          )}
+                      </div>
+                    </div>
+                    <div className="form-row">
+                      <label htmlFor="proxyPassword" className="checkbox-label">
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(messages.proxyPassword)}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <div className="form-input-field">
+                          <Field
+                            id="proxyPassword"
+                            name="proxyPassword"
+                            type="password"
+                          />
+                        </div>
+                        {errors.proxyPassword &&
+                          touched.proxyPassword &&
+                          typeof errors.proxyPassword === 'string' && (
+                            <div className="error">{errors.proxyPassword}</div>
+                          )}
+                      </div>
+                    </div>
+                    <div className="form-row">
+                      <label
+                        htmlFor="proxyBypassFilter"
+                        className="checkbox-label"
+                      >
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(messages.proxyBypassFilter)}
+                        </span>
+                        <span className="label-tip ml-4">
+                          {intl.formatMessage(messages.proxyBypassFilterTip)}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <div className="form-input-field">
+                          <Field
+                            id="proxyBypassFilter"
+                            name="proxyBypassFilter"
+                            type="text"
+                          />
+                        </div>
+                        {errors.proxyBypassFilter &&
+                          touched.proxyBypassFilter &&
+                          typeof errors.proxyBypassFilter === 'string' && (
+                            <div className="error">
+                              {errors.proxyBypassFilter}
+                            </div>
+                          )}
+                      </div>
+                    </div>
+                    <div className="form-row">
+                      <label
+                        htmlFor="proxyBypassLocalAddresses"
+                        className="checkbox-label"
+                      >
+                        <span className="mr-2 ml-4">
+                          {intl.formatMessage(
+                            messages.proxyBypassLocalAddresses
+                          )}
+                        </span>
+                      </label>
+                      <div className="form-input-area">
+                        <Field
+                          type="checkbox"
+                          id="proxyBypassLocalAddresses"
+                          name="proxyBypassLocalAddresses"
+                          onChange={() => {
+                            setFieldValue(
+                              'proxyBypassLocalAddresses',
+                              !values.proxyBypassLocalAddresses
+                            );
+                          }}
+                        />
+                      </div>
+                    </div>
+                  </>
+                )}
                <div className="actions">
                  <div className="flex justify-end">
                    <span className="ml-3 inline-flex rounded-md shadow-sm">
Author	SHA1	Message	Date
Gauthier	b133d5a8a6	refactor: try to switch externalapi to axios to fix performance issue	2024-11-06 21:16:47 +01:00
Gauthier	64f4610b9f	fix: resolve error when setup on second attempt (#1061 )	2024-11-06 15:21:19 +08:00
Ludovic Ortega	2d3b777daf	docs: migrate to docker compose v2 (#1073 ) Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>	2024-11-04 22:48:37 +08:00
Fallenbagel	cf59102ef9	fix(externalapi): extract basic auth and pass it through header (#1062 ) This commit adds extraction of basic authentication credentials from the URL and then pass the credentials as the `Authorization` header. And then credentials are removed from the URL before being passed to fetch. This is done because fetch request cannot be constructed using a URL with credentials fix #1027	2024-11-03 14:35:20 +08:00
Gauthier	ca838a00fa	feat: add bypass list, bypass local addresses and username/password to proxy setting (#1059 ) * fix: use fs/promises for settings This PR switches from synchronous operations with the 'fs' module to asynchronous operations with the 'fs/promises' module. It also corrects a small error with hostname migration. * fix: add missing merge function of default and current config * feat: add bypass list, bypass local addresses and username/password to proxy setting This PR adds more options to the proxy setting, like username/password authentication, bypass list of domains and bypass local addresses. The UX is taken from arrs. fix: add error handling for proxy creating * fix: remove logs	2024-10-31 16:10:45 +01:00
Gauthier	f2ed101e52	fix: use fs/promises for settings (#1057 ) * fix: use fs/promises for settings This PR switches from synchronous operations with the 'fs' module to asynchronous operations with the 'fs/promises' module. It also corrects a small error with hostname migration. * fix: add missing merge function of default and current config * refactor: add more logs to migration	2024-10-31 15:51:57 +01:00