refactor: switch from Fetch API to Axios

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>

.dockerignore

@@ -18,7 +18,7 @@ config/logs/*
 config/*.json
 dist
 Dockerfile*
-docker-compose.yml
+compose.yaml
 docs
 LICENSE
 node_modules

.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

.gitignore

@@ -34,6 +34,7 @@ yarn-error.log*
 # database
 config/db/*.sqlite3*
 config/settings.json
+config/settings.old.json
 
 # logs
 config/logs/*.log*

.prettierignore

@@ -8,4 +8,3 @@ pnpm-lock.yaml
 # assets
 src/assets/
 public/
-docs/

.prettierrc.js

@@ -3,12 +3,6 @@ module.exports = {
   singleQuote: true,
   trailingComma: 'es5',
   overrides: [
-    {
-      files: 'pnpm-lock.yaml',
-      options: {
-        rangeEnd: 0, // default: Infinity
-      },
-    },
     {
       files: 'gen-docs/pnpm-lock.yaml',
       options: {

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.
 

compose.yaml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   jellyseerr:
     build:

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:

docs/getting-started/aur.mdx

@@ -6,6 +6,10 @@ sidebar_position: 4
 
 # AUR (Arch User Repository)
 
+:::note Disclaimer
+This AUR package is not maintained by us but by a third party. Please refer to the maintainer for any issues.
+:::
+
 :::info
 This method is not recommended for most users. It is intended for advanced users who are using Arch Linux or an Arch-based distribution.
 :::

docs/getting-started/buildfromsource.mdx

@@ -3,7 +3,9 @@ title: Build From Source (Advanced)
 description: Install Jellyseerr by building from source
 sidebar_position: 2
 ---
+
 # Build from Source (Advanced)
+
 :::warning
 This method is not recommended for most users. It is intended for advanced users who are familiar with managing their own server infrastructure.
 :::
@@ -12,31 +14,43 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 ### Prerequisites
+
     - [Node.js 20.x](https://nodejs.org/en/download/)
     - [Pnpm 9.x](https://pnpm.io/installation)
     - [Git](https://git-scm.com/downloads)
 
 ## Unix (Linux, macOS)
+
 ### Installation
+
 1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
+
 ```bash
 sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
 ```
+
 2. Clone the Jellyseerr repository and checkout the develop branch:
+
 ```bash
 git clone https://github.com/Fallenbagel/jellyseerr.git
 cd jellyseerr
 git checkout develop # by default, you are on the develop branch so this step is not necessary
 ```
+
 3. Install the dependencies:
+
 ```bash
 CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
 ```
+
 4. Build the project:
+
 ```bash
 pnpm build
 ```
+
 5. Start Jellyseerr:
+
 ```bash
 pnpm start
 ```
@@ -46,6 +60,7 @@ You can now access Jellyseerr by visiting `http://localhost:5055` in your web br
 :::
 
 #### Extending the installation
+
 <Tabs groupId="unix-extensions" queryString>
   <TabItem value="linux" label="Linux">
 To run jellyseerr as a systemd service:
@@ -56,21 +71,23 @@ To run jellyseerr as a systemd service:
 PORT=5055
 
 ## specify on which interface to listen, by default jellyseerr listens on all interfaces
+
 #HOST=127.0.0.1
 
 ## Uncomment if your media server is emby instead of jellyfin.
+
 # JELLYFIN_TYPE=emby
 
-## Uncomment if you want to force Node.js to resolve IPv4 before IPv6 (advanced users only)
+````
-# FORCE_IPV4_FIRST=true
-```
 2. Then run the following commands:
 ```bash
 which node
-```
+````
+
 Copy the path to node, it should be something like `/usr/bin/node`.
 
 3. Create the systemd service file at `/etc/systemd/system/jellyseerr.service`, using either `sudo systemctl edit jellyseerr` or `sudo nano /etc/systemd/system/jellyseerr.service`:
+
 ```bash
 [Unit]
 Description=Jellyseerr Service
@@ -88,15 +105,18 @@ ExecStart=/usr/bin/node dist/index.js
 [Install]
 WantedBy=multi-user.target
 ```
+
 :::note
 If you are using a different path to node, replace `/usr/bin/node` with the path to node.
 :::
 
 4. Enable and start the service:
+
 ```bash
 sudo systemctl enable jellyseerr
 sudo systemctl start jellyseerr
 ```
+
   </TabItem>
   <TabItem value="macos" label="macOS">
 To run jellyseerr as a launchd service:
@@ -107,6 +127,7 @@ which node
 Copy the path to node, it should be something like `/usr/local/bin/node`.
 
 2. Create a launchd plist file at `~/Library/LaunchAgents/com.jellyseerr.plist`:
+
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -135,21 +156,27 @@ Copy the path to node, it should be something like `/usr/local/bin/node`.
 </dict>
 </plist>
 ```
+
 :::note
 If you are using a different path to node, replace `/usr/local/bin/node` with the path to node.
-:::
+::: 3. Load the service:
-3. Load the service:
+
 ```bash
 sudo launchctl load ~/Library/LaunchAgents/com.jellyseerr.plist
 ```
+
 3. Start the service:
+
 ```bash
 sudo launchctl start com.jellyseerr
 ```
+
 4. To ensure the service starts on boot, run the following command:
+
 ```bash
 sudo lauchctl load
 ```
+
   </TabItem>
   <TabItem value="pm2" label="PM2">
 To run jellyseerr as a PM2 service:
@@ -194,27 +221,38 @@ pm2 status jellyseerr
 </Tabs>
 
 ## Windows
+
 ### Installation
+
 1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
+
 ```powershell
 mkdir C:\jellyseerr
 cd C:\jellyseerr
 ```
+
 2. Clone the Jellyseerr repository and checkout the develop branch:
+
 ```powershell
 git clone https://github.com/Fallenbagel/jellyseerr.git .
 git checkout develop # by default, you are on the develop branch so this step is not necessary
 ```
+
 3. Install the dependencies:
+
 ```powershell
 npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
 ```
+
 4. Build the project:
+
 ```powershell
 pnpm build
 ```
+
 5. Start Jellyseerr:
+
 ```powershell
 pnpm start
 ```
@@ -228,6 +266,7 @@ You can now access Jellyseerr by visiting `http://localhost:5055` in your web br
 :::
 
 #### Extending the installation
+
 <Tabs groupId="windows-extensions" queryString>
   <TabItem value="task-scheduler" label="Task Scheduler">
 To run jellyseerr as a bat script:
@@ -249,6 +288,7 @@ node dist/index.js
 - Click "Finish"
 
 Now, Jellyseerr will start when the computer boots up in the background.
+
   </TabItem>
 
   <TabItem value="nssm" label="NSSM">
@@ -311,9 +351,11 @@ pm2 status jellyseerr
 </Tabs>
 
 ### Updating
+
 To update Jellyseerr, navigate to the Jellyseerr directory and run the following commands:
+
 ```bash
 git pull
 ```
-Then, follow the steps in the installation section to rebuild and restart Jellyseerr.
 
+Then, follow the steps in the installation section to rebuild and restart Jellyseerr.

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.

next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.

next.config.js

@@ -4,7 +4,6 @@
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
-    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
   },
   images: {
     remotePatterns: [

overseerr-api.yml

@@ -1988,6 +1988,9 @@ paths:
                   appDataPath:
                     type: string
                     example: /app/config
+                  appDataPermissions:
+                    type: boolean
+                    example: true
   /settings/main:
     get:
       summary: Get main settings

package.json

@@ -43,6 +43,8 @@
     "@svgr/webpack": "6.5.1",
     "@tanem/react-nprogress": "5.0.30",
     "ace-builds": "1.15.2",
+    "axios": "1.3.4",
+    "axios-rate-limit": "1.3.0",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
     "connect-typeorm": "1.1.4",
@@ -60,6 +62,7 @@
     "express-rate-limit": "6.7.0",
     "express-session": "1.17.3",
     "formik": "^2.4.6",
+    "global-agent": "^3.0.0",
     "gravatar-url": "3.1.0",
     "lodash": "4.17.21",
     "mime": "3",
@@ -93,7 +96,8 @@
     "sqlite3": "5.1.4",
     "swagger-ui-express": "4.6.2",
     "swr": "2.2.5",
-    "typeorm": "0.3.12",
+    "typeorm": "0.3.11",
+    "undici": "^6.20.1",
     "web-push": "3.5.0",
     "winston": "3.8.2",
     "winston-daily-rotate-file": "4.7.1",

server/api/animelist.ts

@@ -1,8 +1,7 @@
 import logger from '@server/logger';
-import fs, { promises as fsp } from 'node:fs';
+import axios from 'axios';
-import path from 'node:path';
+import fs, { promises as fsp } from 'fs';
-import { Readable } from 'node:stream';
+import path from 'path';
-import type { ReadableStream } from 'node:stream/web';
 import xml2js from 'xml2js';
 
 const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
@@ -162,18 +161,13 @@ class AnimeListMapping {
       label: 'Anime-List Sync',
     });
     try {
-      const response = await fetch(MAPPING_URL);
+      const response = await axios.get(MAPPING_URL, {
-      if (!response.ok) {
+        responseType: 'stream',
-        throw new Error(`Failed to fetch: ${response.statusText}`);
+      });
-      }
+      await new Promise<void>((resolve) => {
-      await new Promise<void>((resolve, reject) => {
         const writer = fs.createWriteStream(LOCAL_PATH);
         writer.on('finish', resolve);
-        writer.on('error', reject);
+        response.data.pipe(writer);
-        if (!response.body) return reject();
-        Readable.fromWeb(response.body as ReadableStream<Uint8Array>).pipe(
-          writer
-        );
       });
     } catch (e) {
       throw new Error(`Failed to download Anime-List mapping: ${e.message}`);

server/api/externalapi.ts

@@ -1,5 +1,6 @@
-import type { RateLimitOptions } from '@server/utils/rateLimit';
+import type { AxiosInstance, AxiosRequestConfig } from 'axios';
-import rateLimit from '@server/utils/rateLimit';
+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 axios: AxiosInstance;
-  protected params: Record<string, string>;
-  protected defaultHeaders: { [key: string]: string };
   private baseUrl: string;
   private cache?: NodeCache;
 
   constructor(
     baseUrl: string,
-    params: Record<string, string> = {},
+    params: Record<string, unknown>,
     options: ExternalAPIOptions = {}
   ) {
-    if (options.rateLimit) {
+    this.axios = axios.create({
-      this.fetch = rateLimit(fetch, options.rateLimit);
+      baseURL: baseUrl,
-    } else {
+      params,
-      this.fetch = fetch;
+      headers: {
-    }
-
-    this.baseUrl = baseUrl;
-    this.params = params;
-    this.defaultHeaders = {
         '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.cache = options.nodeCache;
   }
 
   protected async get<T>(
     endpoint: string,
-    params?: Record<string, string>,
+    config?: AxiosRequestConfig,
-    ttl?: number,
+    ttl?: number
-    config?: RequestInit
   ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
-      ...this.params,
-      ...params,
-    });
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params);
+    const response = await this.axios.get<T>(endpoint, config);
-    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);
 
-    if (this.cache && ttl !== 0) {
+    if (this.cache) {
-      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+      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>,
+    config?: AxiosRequestConfig,
-    ttl?: number,
+    ttl?: number
-    config?: RequestInit
   ): Promise<T> {
     const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
+      config: config?.params,
       data,
     });
     const cachedItem = this.cache?.get<T>(cacheKey);
@@ -99,117 +84,21 @@ class ExternalAPI {
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params);
+    const response = await this.axios.post<T>(endpoint, data, config);
-    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);
 
-    if (this.cache && ttl !== 0) {
+    if (this.cache) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
+      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
-  ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
-      data,
-    });
-    const cachedItem = this.cache?.get<T>(cacheKey);
-    if (cachedItem) {
-      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);
-
-    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
-    }
-
-    return resData;
-  }
-
-  protected async delete<T>(
-    endpoint: string,
-    params?: Record<string, string>,
-    config?: RequestInit
-  ): 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 data = await this.getDataFromResponse(response);
-
-    return data;
   }
 
   protected async getRolling<T>(
     endpoint: string,
-    params?: Record<string, string>,
+    config?: AxiosRequestConfig,
-    ttl?: number,
+    ttl?: number
-    config?: RequestInit,
-    overwriteBaseUrl?: string
   ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, {
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
-      ...this.params,
-      ...params,
-    });
     const cachedItem = this.cache?.get<T>(cacheKey);
 
     if (cachedItem) {
@@ -220,78 +109,20 @@ class ExternalAPI {
         keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
         Date.now() - DEFAULT_ROLLING_BUFFER
       ) {
-        const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
+        this.axios.get<T>(endpoint, config).then((response) => {
-        this.fetch(url, {
+          this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
-          ...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);
         });
       }
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
+    const response = await this.axios.get<T>(endpoint, config);
-    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);
 
     if (this.cache) {
-      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
     }
 
-    return data;
+    return response.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())
-    );
   }
 
   private serializeCacheKey(
@@ -304,29 +135,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;

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(),
+          params: {
+            per_page: take,
             branch,
+          },
         }
       );
 

server/api/jellyfin.ts

@@ -109,6 +109,8 @@ class JellyfinAPI extends ExternalAPI {
       {
         headers: {
           'X-Emby-Authorization': authHeaderVal,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
         },
       }
     );
@@ -120,7 +122,7 @@ class JellyfinAPI extends ExternalAPI {
     ClientIP?: string
   ): Promise<JellyfinLoginResponse> {
     const authenticate = async (useHeaders: boolean) => {
-      const headers: { [key: string]: string } =
+      const headers =
         useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
 
       return this.post<JellyfinLoginResponse>(
@@ -129,8 +131,6 @@ class JellyfinAPI extends ExternalAPI {
           Username,
           Pw: Password,
         },
-        {},
-        undefined,
         { headers }
       );
     };
@@ -291,16 +291,7 @@ class JellyfinAPI extends ExternalAPI {
   public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const libraryItemsResponse = await this.get<any>(
-        `/Users/${this.userId}/Items`,
+        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
-        {
-          SortBy: 'SortName',
-          SortOrder: 'Ascending',
-          IncludeItemTypes: 'Series,Movie,Others',
-          Recursive: 'true',
-          StartIndex: '0',
-          ParentId: id,
-          collapseBoxSetItems: 'false',
-        }
       );
 
       return libraryItemsResponse.Items.filter(
@@ -319,11 +310,7 @@ class JellyfinAPI extends ExternalAPI {
   public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const itemResponse = await this.get<any>(
-        `/Users/${this.userId}/Items/Latest`,
+        `/Users/${this.userId}/Items/Latest?Limit=12&ParentId=${id}`
-        {
-          Limit: '12',
-          ParentId: id,
-        }
       );
 
       return itemResponse;
@@ -382,10 +369,7 @@ class JellyfinAPI extends ExternalAPI {
   ): Promise<JellyfinLibraryItem[]> {
     try {
       const episodeResponse = await this.get<any>(
-        `/Shows/${seriesID}/Episodes`,
+        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
-        {
-          seasonId: seasonID,
-        }
       );
 
       return episodeResponse.Items.filter(
@@ -410,7 +394,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' }
       );
 

server/api/plexapi.ts

@@ -180,7 +180,7 @@ class PlexAPI {
       settings.plex.libraries = [];
     }
 
-    settings.save();
+    await settings.save();
   }
 
   public async getLibraryContents(

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', {
+      const devicesResp = await this.axios.get(
-        includeHttps: '1',
+        '/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,26 +270,25 @@ class PlexTvAPI extends ExternalAPI {
     items: PlexWatchlistItem[];
   }> {
     try {
-      const params = new URLSearchParams({
+      const response = await this.axios.get<WatchlistResponse>(
-        'X-Plex-Container-Start': offset.toString(),
+        '/library/sections/watchlist/all',
-        'X-Plex-Container-Size': size.toString(),
-      });
-      const response = await this.fetch(
-        `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
         {
-          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) => {
+        (response.data.MediaContainer.Metadata ?? []).map(
+          async (watchlistItem) => {
             const detailedResponse = await this.getRolling<MetadataResponse>(
               `/library/metadata/${watchlistItem.ratingKey}`,
-            {},
+              {
-            undefined,
+                baseURL: 'https://metadata.provider.plex.tv',
-            {},
+              }
-            'https://metadata.provider.plex.tv'
             );
 
             const metadata = detailedResponse.MediaContainer.Metadata[0];
@@ -303,7 +311,8 @@ class PlexTvAPI extends ExternalAPI {
               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) {

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', {
+        params: {
           token: appToken,
+        },
       });
 
       return mapSounds(data.sounds);

server/api/rating/imdbRadarrProxy.ts

@@ -155,13 +155,13 @@ export interface IMDBRating {
  */
 class IMDBRadarrProxy extends ExternalAPI {
   constructor() {
-    super(
+    super('https://api.radarr.video/v1', {
-      'https://api.radarr.video/v1',
+      headers: {
-      {},
+        'Content-Type': 'application/json',
-      {
+        Accept: 'application/json',
+      },
       nodeCache: cacheManager.getCache('imdb').data,
-      }
+    });
-    );
   }
 
   /**

server/api/rating/rottentomatoes.ts

@@ -63,12 +63,15 @@ class RottenTomatoes extends ExternalAPI {
     super(
       'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
       {
-        'x-algolia-agent': 'Algolia for JavaScript (4.14.3); Browser (lite)',
+        'x-algolia-agent':
+          'Algolia%20for%20JavaScript%20(4.14.3)%3B%20Browser%20(lite)',
         'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
         'x-algolia-application-id': '79FRDP12PN',
       },
       {
         headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
           'x-algolia-usertoken': settings.clientId,
         },
         nodeCache: cacheManager.getCache('rt').data,

server/api/servarr/base.ts

@@ -113,9 +113,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getSystemStatus = async (): Promise<SystemStatus> => {
     try {
-      const data = await this.get<SystemStatus>('/system/status');
+      const response = await this.axios.get<SystemStatus>('/system/status');
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve system status: ${e.message}`
@@ -157,15 +157,16 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
     try {
-      const data = await this.get<QueueResponse<QueueItemAppendT>>(
+      const response = await this.axios.get<QueueResponse<QueueItemAppendT>>(
         `/queue`,
         {
-          includeEpisode: 'true',
+          params: {
+            includeEpisode: true,
           },
-        0
+        }
       );
 
-      return data.records;
+      return response.data.records;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve queue: ${e.message}`
@@ -175,9 +176,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getTags = async (): Promise<Tag[]> => {
     try {
-      const data = await this.get<Tag[]>(`/tag`);
+      const response = await this.axios.get<Tag[]>(`/tag`);
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve tags: ${e.message}`
@@ -187,11 +188,11 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public createTag = async ({ label }: { label: string }): Promise<Tag> => {
     try {
-      const data = await this.post<Tag>(`/tag`, {
+      const response = await this.axios.post<Tag>(`/tag`, {
         label,
       });
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
     }
@@ -206,15 +207,10 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
     options: Record<string, unknown>
   ): Promise<void> {
     try {
-      await this.post(
+      await this.axios.post(`/command`, {
-        `/command`,
-        {
         name: commandName,
         ...options,
-        },
+      });
-        {},
-        0
-      );
     } catch (e) {
       throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
     }

server/api/servarr/radarr.ts

@@ -37,9 +37,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public getMovies = async (): Promise<RadarrMovie[]> => {
     try {
-      const data = await this.get<RadarrMovie[]>('/movie');
+      const response = await this.axios.get<RadarrMovie[]>('/movie');
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
     }
@@ -47,9 +47,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
     try {
-      const data = await this.get<RadarrMovie>(`/movie/${id}`);
+      const response = await this.axios.get<RadarrMovie>(`/movie/${id}`);
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
     }
@@ -57,15 +57,17 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
     try {
-      const data = await this.get<RadarrMovie[]>('/movie/lookup', {
+      const response = await this.axios.get<RadarrMovie[]>('/movie/lookup', {
+        params: {
           term: `tmdb:${id}`,
+        },
       });
 
-      if (!data[0]) {
+      if (!response.data[0]) {
         throw new Error('Movie not found');
       }
 
-      return data[0];
+      return response.data[0];
     } catch (e) {
       logger.error('Error retrieving movie by TMDB ID', {
         label: 'Radarr API',
@@ -95,7 +97,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
       // movie exists in Radarr but is neither downloaded nor monitored
       if (movie.id && !movie.monitored) {
-        const data = await this.put<RadarrMovie>(`/movie`, {
+        const response = await this.axios.put<RadarrMovie>(`/movie`, {
           ...movie,
           title: options.title,
           qualityProfileId: options.qualityProfileId,
@@ -112,25 +114,25 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
           },
         });
 
-        if (data.monitored) {
+        if (response.data.monitored) {
           logger.info(
             'Found existing title in Radarr and set it to monitored.',
             {
               label: 'Radarr',
-              movieId: data.id,
+              movieId: response.data.id,
-              movieTitle: data.title,
+              movieTitle: response.data.title,
             }
           );
           logger.debug('Radarr update details', {
             label: 'Radarr',
-            movie: data,
+            movie: response.data,
           });
 
           if (options.searchNow) {
-            this.searchMovie(data.id);
+            this.searchMovie(response.data.id);
           }
 
-          return data;
+          return response.data;
         } else {
           logger.error('Failed to update existing movie in Radarr.', {
             label: 'Radarr',
@@ -148,7 +150,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         return movie;
       }
 
-      const data = await this.post<RadarrMovie>(`/movie`, {
+      const response = await this.axios.post<RadarrMovie>(`/movie`, {
         title: options.title,
         qualityProfileId: options.qualityProfileId,
         profileId: options.profileId,
@@ -164,11 +166,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         },
       });
 
-      if (data.id) {
+      if (response.data.id) {
         logger.info('Radarr accepted request', { label: 'Radarr' });
         logger.debug('Radarr add details', {
           label: 'Radarr',
-          movie: data,
+          movie: response.data,
         });
       } else {
         logger.error('Failed to add movie to Radarr', {
@@ -177,7 +179,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         });
         throw new Error('Failed to add movie to Radarr');
       }
-      return data;
+      return response.data;
     } catch (e) {
       let errorData;
       try {
@@ -221,9 +223,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
   public removeMovie = async (movieId: number): Promise<void> => {
     try {
       const { id, title } = await this.getMovieByTmdbId(movieId);
-      await this.delete(`/movie/${id}`, {
+      await this.axios.delete(`/movie/${id}`, {
-        deleteFiles: 'true',
+        params: {
-        addImportExclusion: 'false',
+          deleteFiles: true,
+          addImportExclusion: false,
+        },
       });
       logger.info(`[Radarr] Removed movie ${title}`);
     } catch (e) {

server/api/servarr/sonarr.ts

@@ -117,9 +117,9 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeries(): Promise<SonarrSeries[]> {
     try {
-      const data = await this.get<SonarrSeries[]>('/series');
+      const response = await this.axios.get<SonarrSeries[]>('/series');
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
     }
@@ -127,9 +127,9 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesById(id: number): Promise<SonarrSeries> {
     try {
-      const data = await this.get<SonarrSeries>(`/series/${id}`);
+      const response = await this.axios.get<SonarrSeries>(`/series/${id}`);
 
-      return data;
+      return response.data;
     } catch (e) {
       throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
     }
@@ -137,15 +137,17 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
     try {
-      const data = await this.get<SonarrSeries[]>('/series/lookup', {
+      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
+        params: {
           term: title,
+        },
       });
 
-      if (!data[0]) {
+      if (!response.data[0]) {
         throw new Error('No series found');
       }
 
-      return data;
+      return response.data;
     } catch (e) {
       logger.error('Error retrieving series by series title', {
         label: 'Sonarr API',
@@ -158,15 +160,17 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
     try {
-      const data = await this.get<SonarrSeries[]>('/series/lookup', {
+      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
+        params: {
           term: `tvdb:${id}`,
+        },
       });
 
-      if (!data[0]) {
+      if (!response.data[0]) {
         throw new Error('Series not found');
       }
 
-      return data[0];
+      return response.data[0];
     } catch (e) {
       logger.error('Error retrieving series by tvdb ID', {
         label: 'Sonarr API',
@@ -187,27 +191,27 @@ class SonarrAPI extends ServarrBase<{
         series.tags = options.tags ?? series.tags;
         series.seasons = this.buildSeasonList(options.seasons, series.seasons);
 
-        const newSeriesData = await this.put<SonarrSeries>(
+        const newSeriesResponse = await this.axios.put<SonarrSeries>(
           '/series',
-          series as any
+          series
         );
 
-        if (newSeriesData.id) {
+        if (newSeriesResponse.data.id) {
           logger.info('Updated existing series in Sonarr.', {
             label: 'Sonarr',
-            seriesId: newSeriesData.id,
+            seriesId: newSeriesResponse.data.id,
-            seriesTitle: newSeriesData.title,
+            seriesTitle: newSeriesResponse.data.title,
           });
           logger.debug('Sonarr update details', {
             label: 'Sonarr',
-            movie: newSeriesData,
+            movie: newSeriesResponse.data,
           });
 
           if (options.searchNow) {
-            this.searchSeries(newSeriesData.id);
+            this.searchSeries(newSeriesResponse.data.id);
           }
 
-          return newSeriesData;
+          return newSeriesResponse.data;
         } else {
           logger.error('Failed to update series in Sonarr', {
             label: 'Sonarr',
@@ -217,7 +221,9 @@ class SonarrAPI extends ServarrBase<{
         }
       }
 
-      const createdSeriesData = await this.post<SonarrSeries>('/series', {
+      const createdSeriesResponse = await this.axios.post<SonarrSeries>(
+        '/series',
+        {
           tvdbId: options.tvdbid,
           title: options.title,
           qualityProfileId: options.profileId,
@@ -239,13 +245,14 @@ class SonarrAPI extends ServarrBase<{
             ignoreEpisodesWithFiles: true,
             searchForMissingEpisodes: options.searchNow,
           },
-      } as Partial<SonarrSeries>);
+        } as Partial<SonarrSeries>
+      );
 
-      if (createdSeriesData.id) {
+      if (createdSeriesResponse.data.id) {
         logger.info('Sonarr accepted request', { label: 'Sonarr' });
         logger.debug('Sonarr add details', {
           label: 'Sonarr',
-          movie: createdSeriesData,
+          movie: createdSeriesResponse.data,
         });
       } else {
         logger.error('Failed to add movie to Sonarr', {
@@ -255,7 +262,7 @@ class SonarrAPI extends ServarrBase<{
         throw new Error('Failed to add series to Sonarr');
       }
 
-      return createdSeriesData;
+      return createdSeriesResponse.data;
     } catch (e) {
       let errorData;
       try {
@@ -340,13 +347,14 @@ class SonarrAPI extends ServarrBase<{
 
     return newSeasons;
   }
-
   public removeSerie = async (serieId: number): Promise<void> => {
     try {
       const { id, title } = await this.getSeriesByTvdbId(serieId);
-      await this.delete(`/series/${id}`, {
+      await this.axios.delete(`/series/${id}`, {
-        deleteFiles: 'true',
+        params: {
-        addImportExclusion: 'false',
+          deleteFiles: true,
+          addImportExclusion: false,
+        },
       });
       logger.info(`[Radarr] Removed serie ${title}`);
     } catch (e) {

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(
+    this.axios = axios.create({
-      `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
         settings.port
       }${settings.urlBase ?? ''}`,
-      {
+      params: { apikey: settings.apiKey },
-        apikey: settings.apiKey || '',
+    });
-      }
-    );
   }
 
   public async getInfo(): Promise<TautulliInfo> {
     try {
       return (
-        await this.get<TautulliInfoResponse>('/api/v2', {
+        await this.axios.get<TautulliInfoResponse>('/api/v2', {
-          cmd: 'get_tautulli_info',
+          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', {
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
             cmd: 'get_item_watch_time_stats',
             rating_key: ratingKey,
-          grouping: '1',
+            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', {
+        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
+          params: {
             cmd: 'get_item_user_stats',
             rating_key: ratingKey,
-          grouping: '1',
+            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', {
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
             cmd: 'get_user_watch_time_stats',
-          user_id: user.plexId.toString(),
+            user_id: user.plexId,
-          query_days: '0',
+            query_days: 0,
-          grouping: '1',
+            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', {
+          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
+            params: {
               cmd: 'get_history',
-            grouping: '1',
+              grouping: 1,
               order_column: 'date',
               order_dir: 'desc',
-            user_id: user.plexId.toString(),
+              user_id: user.plexId,
               media_type: 'movie,episode',
-            length: take.toString(),
+              length: take,
-            start: start.toString(),
+              start,
+            },
           })
-        ).response.data.data;
+        ).data.response.data.data;
 
         if (!tautulliData.length) {
           return results;

server/api/themoviedb/index.ts

@@ -113,8 +113,8 @@ class TheMovieDb extends ExternalAPI {
       {
         nodeCache: cacheManager.getCache('tmdb').data,
         rateLimit: {
+          maxRequests: 20,
           maxRPS: 50,
-          id: 'tmdb',
         },
       }
     );
@@ -130,10 +130,7 @@ class TheMovieDb extends ExternalAPI {
   }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
     try {
       const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        query,
+        params: { query, page, include_adult: includeAdult, language },
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
       });
 
       return data;
@@ -156,11 +153,13 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
     try {
       const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
+        params: {
           query,
-        page: page.toString(),
+          page,
-        include_adult: includeAdult ? 'true' : 'false',
+          include_adult: includeAdult,
           language,
-        primary_release_year: year?.toString() || '',
+          primary_release_year: year,
+        },
       });
 
       return data;
@@ -183,11 +182,13 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
     try {
       const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
+        params: {
           query,
-        page: page.toString(),
+          page,
-        include_adult: includeAdult ? 'true' : 'false',
+          include_adult: includeAdult,
           language,
-        first_air_date_year: year?.toString() || '',
+          first_air_date_year: year,
+        },
       });
 
       return data;
@@ -210,7 +211,7 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbPersonDetails> => {
     try {
       const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        language,
+        params: { language },
       });
 
       return data;
@@ -230,7 +231,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbPersonCombinedCredits>(
         `/person/${personId}/combined_credits`,
         {
-          language,
+          params: { language },
         }
       );
 
@@ -253,10 +254,12 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbMovieDetails>(
         `/movie/${movieId}`,
         {
+          params: {
             language,
             append_to_response:
               'credits,external_ids,videos,keywords,release_dates,watch/providers',
           },
+        },
         43200
       );
 
@@ -277,10 +280,12 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbTvDetails>(
         `/tv/${tvId}`,
         {
+          params: {
             language,
             append_to_response:
               'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
           },
+        },
         43200
       );
 
@@ -303,8 +308,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSeasonWithEpisodes>(
         `/tv/${tvId}/season/${seasonNumber}`,
         {
-          language: language || '',
+          params: {
+            language,
             append_to_response: 'external_ids',
+          },
         }
       );
 
@@ -327,8 +334,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/recommendations`,
         {
-          page: page.toString(),
+          params: {
+            page,
             language,
+          },
         }
       );
 
@@ -351,8 +360,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/similar`,
         {
-          page: page.toString(),
+          params: {
+            page,
             language,
+          },
         }
       );
 
@@ -375,8 +386,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/keyword/${keywordId}/movies`,
         {
-          page: page.toString(),
+          params: {
+            page,
             language,
+          },
         }
       );
 
@@ -399,8 +412,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/tv/${tvId}/recommendations`,
         {
-          page: page.toString(),
+          params: {
+            page,
             language,
+          },
         }
       );
 
@@ -423,8 +438,10 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbSearchTvResponse> {
     try {
       const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        page: page.toString(),
+        params: {
+          page,
           language,
+        },
       });
 
       return data;
@@ -465,38 +482,40 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
+        params: {
           sort_by: sortBy,
-        page: page.toString(),
+          page,
-        include_adult: includeAdult ? 'true' : 'false',
+          include_adult: includeAdult,
           language,
-        region: this.region || '',
+          region: this.region,
           with_original_language:
             originalLanguage && originalLanguage !== 'all'
               ? originalLanguage
               : originalLanguage === 'all'
-            ? ''
+              ? undefined
-            : this.originalLanguage || '',
+              : 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 || '',
+              : primaryReleaseDateGte,
           'primary_release_date.lte':
             !primaryReleaseDateLte && primaryReleaseDateGte
               ? defaultFutureDate
-            : primaryReleaseDateLte || '',
+              : primaryReleaseDateLte,
-        with_genres: genre || '',
+          with_genres: genre,
-        with_companies: studio || '',
+          with_companies: studio,
-        with_keywords: keywords || '',
+          with_keywords: keywords,
-        'with_runtime.gte': withRuntimeGte || '',
+          'with_runtime.gte': withRuntimeGte,
-        'with_runtime.lte': withRuntimeLte || '',
+          'with_runtime.lte': withRuntimeLte,
-        'vote_average.gte': voteAverageGte || '',
+          'vote_average.gte': voteAverageGte,
-        'vote_average.lte': voteAverageLte || '',
+          'vote_average.lte': voteAverageLte,
-        'vote_count.gte': voteCountGte || '',
+          'vote_count.gte': voteCountGte,
-        'vote_count.lte': voteCountLte || '',
+          'vote_count.lte': voteCountLte,
-        watch_region: watchRegion || '',
+          watch_region: watchRegion,
-        with_watch_providers: watchProviders || '',
+          with_watch_providers: watchProviders,
+        },
       });
 
       return data;
@@ -538,6 +557,7 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
+        params: {
           sort_by: sortBy,
           page: page.toString(),
           language,
@@ -573,6 +593,7 @@ class TheMovieDb extends ExternalAPI {
           with_watch_providers: watchProviders || '',
           watch_region: watchRegion || '',
           with_status: withStatus || '',
+        },
       });
 
       return data;
@@ -592,10 +613,12 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbUpcomingMoviesResponse>(
         '/movie/upcoming',
         {
-          page: page.toString(),
+          params: {
+            page,
             language,
-          region: this.region || '',
+            region: this.region,
-          originalLanguage: this.originalLanguage || '',
+            originalLanguage: this.originalLanguage,
+          },
         }
       );
 
@@ -618,9 +641,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMultiResponse>(
         `/trending/all/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page,
             language,
-          region: this.region || '',
+            region: this.region,
+          },
         }
       );
 
@@ -641,7 +666,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/trending/movie/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page,
+          },
         }
       );
 
@@ -662,7 +689,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/trending/tv/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page,
+          },
         }
       );
 
@@ -691,8 +720,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbExternalIdResponse>(
         `/find/${externalId}`,
         {
+          params: {
             external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
             language,
+          },
         }
       );
 
@@ -782,7 +813,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCollection>(
         `/collection/${collectionId}`,
         {
+          params: {
             language,
+          },
         }
       );
 
@@ -855,8 +888,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/movie/list',
         {
+          params: {
             language,
           },
+        },
         86400 // 24 hours
       );
 
@@ -867,8 +902,10 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/movie/list',
           {
+            params: {
               language: 'en',
             },
+          },
           86400 // 24 hours
         );
 
@@ -902,8 +939,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/tv/list',
         {
+          params: {
             language,
           },
+        },
         86400 // 24 hours
       );
 
@@ -914,8 +953,10 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/tv/list',
           {
+            params: {
               language: 'en',
             },
+          },
           86400 // 24 hours
         );
 
@@ -969,8 +1010,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbKeywordSearchResponse>(
         '/search/keyword',
         {
+          params: {
             query,
-          page: page.toString(),
+            page,
+          },
         },
         86400 // 24 hours
       );
@@ -992,8 +1035,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCompanySearchResponse>(
         '/search/company',
         {
+          params: {
             query,
-          page: page.toString(),
+            page,
+          },
         },
         86400 // 24 hours
       );
@@ -1013,7 +1058,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,9 +1084,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/movie',
         {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
+            language: language ?? this.originalLanguage,
             watch_region: watchRegion,
           },
+        },
         86400 // 24 hours
       );
 
@@ -1062,9 +1111,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/tv',
         {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
+            language: language ?? this.originalLanguage,
             watch_region: watchRegion,
           },
+        },
         86400 // 24 hours
       );
 

server/index.ts

@@ -21,7 +21,9 @@ import clearCookies from '@server/middleware/clearcookies';
 import routes from '@server/routes';
 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';
@@ -33,17 +35,10 @@ import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
-import dns from 'node:dns';
-import net from 'node:net';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';
 
-if (process.env.forceIpv4First === 'true') {
-  dns.setDefaultResultOrder('ipv4first');
-  net.setDefaultAutoSelectFamily(false);
-}
-
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
 
 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -51,6 +46,12 @@ const dev = process.env.NODE_ENV !== 'production';
 const app = next({ dev });
 const handle = app.getRequestHandler();
 
+if (!appDataPermissions()) {
+  logger.error(
+    'Something went wrong while checking config folder! Please ensure the config folder is set up properly.\nhttps://docs.jellyseerr.dev/getting-started'
+  );
+}
+
 app
   .prepare()
   .then(async () => {
@@ -67,6 +68,11 @@ app
     const settings = await getSettings().load();
     restartFlag.initializeSettings(settings.main);
 
+    // Register HTTP proxy
+    if (settings.main.proxy.enabled) {
+      await createCustomProxyAgent(settings.main.proxy);
+    }
+
     // Migrate library types
     if (
       settings.plex.libraries.length > 1 &&

server/lib/downloadtracker.ts

@@ -106,7 +106,7 @@ class DownloadTracker {
                 { label: 'Download Tracker' }
               );
             }
-          } catch {
+          } catch (e) {
             logger.error(
               `Unable to get queue from Radarr server: ${server.name}`,
               {

server/lib/imageproxy.ts

@@ -1,6 +1,6 @@
 import logger from '@server/logger';
-import type { RateLimitOptions } from '@server/utils/rateLimit';
+import axios from 'axios';
-import rateLimit from '@server/utils/rateLimit';
+import rateLimit, { type rateLimitOptions } from 'axios-rate-limit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
 import mime from 'mime/lite';
@@ -131,33 +131,35 @@ class ImageProxy {
     return 0;
   }
 
-  private fetch: typeof fetch;
+  private axios;
   private cacheVersion;
   private key;
-  private baseUrl;
 
   constructor(
     key: string,
     baseUrl: string,
     options: {
       cacheVersion?: number;
-      rateLimitOptions?: RateLimitOptions;
+      rateLimitOptions?: rateLimitOptions;
+      headers?: Record<string, unknown>;
     } = {}
   ) {
     this.cacheVersion = options.cacheVersion ?? 1;
-    this.baseUrl = baseUrl;
     this.key = key;
+    this.axios = axios.create({
+      baseURL: baseUrl,
+      headers: options.headers,
+    });
 
     if (options.rateLimitOptions) {
-      this.fetch = rateLimit(fetch, {
+      this.axios = rateLimit(this.axios, options.rateLimitOptions);
-        ...options.rateLimitOptions,
-      });
-    } else {
-      this.fetch = fetch;
     }
   }
 
-  public async getImage(path: string): Promise<ImageResponse> {
+  public async getImage(
+    path: string,
+    fallbackPath?: string
+  ): Promise<ImageResponse> {
     const cacheKey = this.getCacheKey(path);
 
     const imageResponse = await this.get(cacheKey);
@@ -166,8 +168,12 @@ class ImageProxy {
       const newImage = await this.set(path, cacheKey);
 
       if (!newImage) {
+        if (fallbackPath) {
+          return await this.getImage(fallbackPath);
+        } else {
           throw new Error('Failed to load image');
         }
+      }
 
       return newImage;
     }
@@ -239,29 +245,23 @@ class ImageProxy {
   ): Promise<ImageResponse | null> {
     try {
       const directory = join(this.getCacheDirectory(), cacheKey);
-      const href =
+      const response = await this.axios.get(path, {
-        this.baseUrl +
+        responseType: 'arraybuffer',
-        (this.baseUrl.length > 0
+      });
-          ? this.baseUrl.endsWith('/')
+
-            ? ''
+      const buffer = Buffer.from(response.data, 'binary');
-            : '/'
-          : '') +
-        (path.startsWith('/') ? path.slice(1) : path);
-      const response = await this.fetch(href);
-      const arrayBuffer = await response.arrayBuffer();
-      const buffer = Buffer.from(arrayBuffer);
 
       const extension = mime.getExtension(
-        response.headers.get('content-type') ?? ''
+        response.headers['Content-Type']?.toString() ?? ''
       );
 
       let maxAge = Number(
-        (response.headers.get('cache-control') ?? '0').split('=')[1]
+        (response.headers['Cache-Control']?.toString() ?? '0').split('=')[1]
       );
 
       if (!maxAge) maxAge = 86400;
       const expireAt = Date.now() + maxAge * 1000;
-      const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');
+      const etag = (response.headers.etag ?? '').replace(/"/g, '');
 
       await this.writeToCacheDir(
         directory,

server/lib/notifications/agents/discord.ts

@@ -4,6 +4,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentDiscord } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -291,23 +292,14 @@ class DiscordAgent
         }
       }
 
-      const response = await fetch(settings.options.webhookUrl, {
+      await axios.post(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
         username: settings.options.botUsername
           ? settings.options.botUsername
           : getSettings().main.applicationTitle,
         avatar_url: settings.options.botAvatarUrl,
         embeds: [this.buildEmbed(type, payload)],
         content: userMentions.join(' '),
-        } as DiscordWebhookPayload),
+      } as DiscordWebhookPayload);
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/gotify.ts

@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentGotify } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -132,16 +133,7 @@ class GotifyAgent
       const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
       const notificationPayload = this.getNotificationPayload(type, payload);
 
-      const response = await fetch(endpoint, {
+      await axios.post(endpoint, notificationPayload);
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(notificationPayload),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/lunasea.ts

@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentLunaSea } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -100,23 +101,19 @@ class LunaSeaAgent
     });
 
     try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await axios.post(
-        method: 'POST',
+        settings.options.webhookUrl,
-        headers: settings.options.profileName
+        this.buildPayload(type, payload),
+        settings.options.profileName
           ? {
-              'Content-Type': 'application/json',
+              headers: {
-            }
-          : {
-              'Content-Type': 'application/json',
                 Authorization: `Basic ${Buffer.from(
                   `${settings.options.profileName}:`
                 ).toString('base64')}`,
               },
-        body: JSON.stringify(this.buildPayload(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
             }
+          : undefined
+      );
 
       return true;
     } catch (e) {

server/lib/notifications/agents/pushbullet.ts

@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushbullet } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -122,20 +123,15 @@ class PushbulletAgent
       });
 
       try {
-        const response = await fetch(endpoint, {
+        await axios.post(
-          method: 'POST',
+          endpoint,
+          { ...notificationPayload, channel_tag: settings.options.channelTag },
+          {
             headers: {
-            'Content-Type': 'application/json',
               'Access-Token': settings.options.accessToken,
             },
-          body: JSON.stringify({
-            ...notificationPayload,
-            channel_tag: settings.options.channelTag,
-          }),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
           }
+        );
       } catch (e) {
         let errorData;
         try {
@@ -174,17 +170,11 @@ class PushbulletAgent
         });
 
         try {
-          const response = await fetch(endpoint, {
+          await axios.post(endpoint, notificationPayload, {
-            method: 'POST',
             headers: {
-              'Content-Type': 'application/json',
               'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
             },
-            body: JSON.stringify(notificationPayload),
           });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
         } catch (e) {
           let errorData;
           try {
@@ -235,17 +225,11 @@ class PushbulletAgent
               });
 
               try {
-                const response = await fetch(endpoint, {
+                await axios.post(endpoint, notificationPayload, {
-                  method: 'POST',
                   headers: {
-                    'Content-Type': 'application/json',
                     'Access-Token': user.settings.pushbulletAccessToken,
                   },
-                  body: JSON.stringify(notificationPayload),
                 });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
               } catch (e) {
                 let errorData;
                 try {

server/lib/notifications/agents/pushover.ts

@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushover } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -51,15 +52,12 @@ class PushoverAgent
     imageUrl: string
   ): Promise<Partial<PushoverImagePayload>> {
     try {
-      const response = await fetch(imageUrl);
+      const response = await axios.get(imageUrl, {
-      if (!response.ok) {
+        responseType: 'arraybuffer',
-        throw new Error(response.statusText, { cause: response });
+      });
-      }
+      const base64 = Buffer.from(response.data, 'binary').toString('base64');
-      const arrayBuffer = await response.arrayBuffer();
-      const base64 = Buffer.from(arrayBuffer).toString('base64');
       const contentType = (
-        response.headers.get('Content-Type') ||
+        response.headers['Content-Type'] || response.headers['content-type']
-        response.headers.get('content-type')
       )?.toString();
 
       return {
@@ -210,21 +208,12 @@ class PushoverAgent
       });
 
       try {
-        const response = await fetch(endpoint, {
+        await axios.post(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
           ...notificationPayload,
           token: settings.options.accessToken,
           user: settings.options.userToken,
           sound: settings.options.sound,
-          } as PushoverPayload),
+        } as PushoverPayload);
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
       } catch (e) {
         let errorData;
         try {
@@ -266,21 +255,12 @@ class PushoverAgent
         });
 
         try {
-          const response = await fetch(endpoint, {
+          await axios.post(endpoint, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             ...notificationPayload,
             token: payload.notifyUser.settings.pushoverApplicationToken,
             user: payload.notifyUser.settings.pushoverUserKey,
             sound: payload.notifyUser.settings.pushoverSound,
-            } as PushoverPayload),
+          } as PushoverPayload);
-          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
         } catch (e) {
           let errorData;
           try {
@@ -332,20 +312,11 @@ class PushoverAgent
               });
 
               try {
-                const response = await fetch(endpoint, {
+                await axios.post(endpoint, {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
                   ...notificationPayload,
                   token: user.settings.pushoverApplicationToken,
                   user: user.settings.pushoverUserKey,
-                  } as PushoverPayload),
+                } as PushoverPayload);
-                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
               } catch (e) {
                 let errorData;
                 try {

server/lib/notifications/agents/slack.ts

@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentSlack } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -237,16 +238,10 @@ class SlackAgent
       subject: payload.subject,
     });
     try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await axios.post(
-        method: 'POST',
+        settings.options.webhookUrl,
-        headers: {
+        this.buildEmbed(type, payload)
-          'Content-Type': 'application/json',
+      );
-        },
-        body: JSON.stringify(this.buildEmbed(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/telegram.ts

@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentTelegram } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -174,20 +175,11 @@ class TelegramAgent
       });
 
       try {
-        const response = await fetch(endpoint, {
+        await axios.post(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
           ...notificationPayload,
           chat_id: settings.options.chatId,
           disable_notification: !!settings.options.sendSilently,
-          } as TelegramMessagePayload | TelegramPhotoPayload),
+        } as TelegramMessagePayload | TelegramPhotoPayload);
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
       } catch (e) {
         let errorData;
         try {
@@ -225,21 +217,12 @@ class TelegramAgent
         });
 
         try {
-          const response = await fetch(endpoint, {
+          await axios.post(endpoint, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             ...notificationPayload,
             chat_id: payload.notifyUser.settings.telegramChatId,
             disable_notification:
               !!payload.notifyUser.settings.telegramSendSilently,
-            } as TelegramMessagePayload | TelegramPhotoPayload),
+          } as TelegramMessagePayload | TelegramPhotoPayload);
-          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
         } catch (e) {
           let errorData;
           try {
@@ -288,20 +271,11 @@ class TelegramAgent
               });
 
               try {
-                const response = await fetch(endpoint, {
+                await axios.post(endpoint, {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
                   ...notificationPayload,
                   chat_id: user.settings.telegramChatId,
                   disable_notification: !!user.settings?.telegramSendSilently,
-                  } as TelegramMessagePayload | TelegramPhotoPayload),
+                } as TelegramMessagePayload | TelegramPhotoPayload);
-                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
               } catch (e) {
                 let errorData;
                 try {

server/lib/notifications/agents/webhook.ts

@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentWebhook } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { get } from 'lodash';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
@@ -177,19 +178,17 @@ class WebhookAgent
     });
 
     try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await axios.post(
-        method: 'POST',
+        settings.options.webhookUrl,
+        this.buildPayload(type, payload),
+        settings.options.authHeader
+          ? {
               headers: {
-          'Content-Type': 'application/json',
+                Authorization: settings.options.authHeader,
-          ...(settings.options.authHeader
-            ? { Authorization: settings.options.authHeader }
-            : {}),
               },
-        body: JSON.stringify(this.buildPayload(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
             }
+          : undefined
+      );
 
       return true;
     } catch (e) {

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) {

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,6 +130,7 @@ export interface MainSettings {
   mediaServerType: number;
   partialRequestsEnabled: boolean;
   locale: string;
+  proxy: ProxySettings;
 }
 
 interface PublicSettings {
@@ -325,6 +337,16 @@ class Settings {
         mediaServerType: MediaServerType.NOT_CONFIGURED,
         partialRequestsEnabled: true,
         locale: 'en',
+        proxy: {
+          enabled: false,
+          hostname: '',
+          port: 8080,
+          useSsl: false,
+          user: '',
+          password: '',
+          bypassFilter: '',
+          bypassLocalAddresses: true,
+        },
       },
       plex: {
         name: '',
@@ -479,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;
   }
 
@@ -584,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;
   }
 
@@ -618,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
    *
@@ -641,30 +641,51 @@ class Settings {
       return this;
     }
 
-    if (!fs.existsSync(SETTINGS_PATH)) {
+    let data;
-      this.save();
+    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);
+      const migratedData = await runMigrations(parsedJson, SETTINGS_PATH);
+      this.data = merge(this.data, migratedData);
+    }
 
-      this.data = merge(this.data, parsedJson);
+    // generate keys and ids if it's missing
-
+    let change = false;
-      if (process.env.API_KEY) {
+    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.save();
+      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 {
+  public async save(): Promise<void> {
-    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(this.data, undefined, ' '));
+    await fs.writeFile(
+      SETTINGS_PATH,
+      JSON.stringify(this.data, undefined, ' ')
+    );
   }
 }
 

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 (settings.jellyfin?.hostname) {
-  if (oldJellyfinSettings && oldJellyfinSettings.hostname) {
+    const { hostname } = settings.jellyfin;
-    const { hostname } = oldJellyfinSettings;
     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;
 };
 

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 ?? '');
+    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;
 };

server/lib/settings/migrator.ts

@@ -1,7 +1,6 @@
-/* eslint-disable no-console */
 import type { AllSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import fs from 'fs';
+import fs from 'fs/promises';
 import path from 'path';
 
 const migrationsDir = path.join(__dirname, 'migrations');
@@ -10,19 +9,56 @@ export const runMigrations = async (
   settings: AllSettings,
   SETTINGS_PATH: string
 ): Promise<AllSettings> => {
-  const migrations = fs
-    .readdirSync(migrationsDir)
-    .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    .map((file) => require(path.join(migrationsDir, file)).default);
-
   let migrated = settings;
 
   try {
+    // we read old backup and create a backup of currents settings
+    const BACKUP_PATH = SETTINGS_PATH.replace('.json', '.old.json');
+    let oldBackup: string | null = null;
+    try {
+      oldBackup = await fs.readFile(BACKUP_PATH, 'utf-8');
+    } catch {
+      /* empty */
+    }
+    await fs.writeFile(BACKUP_PATH, JSON.stringify(settings, undefined, ' '));
+
+    const migrations = (await fs.readdir(migrationsDir)).filter(
+      (file) => file.endsWith('.js') || file.endsWith('.ts')
+    );
+
     const settingsBefore = JSON.stringify(migrated);
 
     for (const migration of migrations) {
-      migrated = await migration(migrated);
+      try {
+        logger.debug(`Checking migration '${migration}'...`, {
+          label: 'Settings Migrator',
+        });
+        const { default: migrationFn } = await import(
+          path.join(migrationsDir, migration)
+        );
+        const newSettings = await migrationFn(structuredClone(migrated));
+        if (JSON.stringify(migrated) !== JSON.stringify(newSettings)) {
+          logger.debug(`Migration '${migration}' has been applied.`, {
+            label: 'Settings Migrator',
+          });
+        }
+        migrated = newSettings;
+      } catch (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();
+      }
     }
 
     const settingsAfter = JSON.stringify(migrated);
@@ -30,30 +66,33 @@ export const runMigrations = async (
     if (settingsBefore !== settingsAfter) {
       // a migration occured
       // we check that the new config will be saved
-      fs.writeFileSync(SETTINGS_PATH, JSON.stringify(migrated, undefined, ' '));
+      await fs.writeFile(
-      const fileSaved = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf-8'));
+        SETTINGS_PATH,
+        JSON.stringify(migrated, undefined, ' ')
+      );
+      const fileSaved = JSON.parse(await fs.readFile(SETTINGS_PATH, 'utf-8'));
       if (JSON.stringify(fileSaved) !== settingsAfter) {
         // something went wrong while saving file
         throw new Error('Unable to save settings after migration.');
       }
+    } else if (oldBackup) {
+      // no migration occured
+      // we save the old backup (to avoid settings.json and settings.old.json being the same)
+      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
+    logger.error(
-    console.log(
+      'A common cause for this issue is a permission error of your configuration folder.',
-      '===================================================================='
+      {
-    );
+        label: 'Settings Migrator',
-    console.log(
+      }
-      '       SOMETHING WENT WRONG WHILE RUNNING SETTINGS MIGRATIONS       '
-    );
-    console.log(
-      '   Please check that your configuration folder is properly set up   '
-    );
-    console.log(
-      '===================================================================='
     );
     process.exit();
   }

server/routes/auth.ts

@@ -6,7 +6,6 @@ import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
 import { startJobs } from '@server/job/schedule';
-import ImageProxy from '@server/lib/imageproxy';
 import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
@@ -15,7 +14,6 @@ import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
-import gravatarUrl from 'gravatar-url';
 import net from 'net';
 
 const authRoutes = Router();
@@ -89,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);
@@ -301,14 +299,27 @@ 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);
       }
 
+      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 Overseerr',
+          'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Jellyseerr',
           {
             label: 'API',
             ip: req.ip,
@@ -318,47 +329,54 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
 
         // 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({
+          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: account.User.PrimaryImageTag
+          avatar: `/avatarproxy/${account.User.Id}`,
-              ? `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+          userType:
-              : gravatarUrl(body.email || account.User.Name, {
+            body.serverType === MediaServerType.JELLYFIN
-                  default: 'mm',
+              ? UserType.JELLYFIN
-                  size: 200,
+              : UserType.EMBY,
-                }),
-            userType: UserType.EMBY,
         });
 
-          break;
+        await userRepository.save(user);
-        case MediaServerType.JELLYFIN:
+      } else {
-          settings.main.mediaServerType = MediaServerType.JELLYFIN;
+        logger.info(
-          user = new User({
+          'Sign-in attempt from Jellyfin user with access to the media server; editing admin user for Jellyseerr',
-            email: body.email || account.User.Name,
+          {
+            label: 'API',
+            ip: req.ip,
             jellyfinUsername: account.User.Name,
-            jellyfinUserId: account.User.Id,
+          }
-            jellyfinDeviceId: deviceId,
+        );
-            jellyfinAuthToken: account.AccessToken,
-            permissions: Permission.ADMIN,
-            avatar: account.User.PrimaryImageTag
-              ? `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-              : gravatarUrl(body.email || account.User.Name, {
-                  default: 'mm',
-                  size: 200,
-                }),
-            userType: UserType.JELLYFIN,
-          });
 
-          break;
+        // User alread exist but settings.json is not configured, we'll edit the admin user
-        default:
+
-          throw new Error('select_server_type');
+        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;
+
+        await userRepository.save(user);
       }
 
       // Create an API key on Jellyfin from this admin user
@@ -378,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) {
@@ -401,27 +417,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
           jellyfinUsername: account.User.Name,
         }
       );
-      // Update the users avatar with their jellyfin profile pic (incase it changed)
+      user.avatar = `/avatarproxy/${account.User.Id}`;
-      if (account.User.PrimaryImageTag) {
-        const avatar = `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
-        if (avatar !== user.avatar) {
-          const avatarProxy = new ImageProxy('avatar', '');
-          avatarProxy.clearCachedImage(user.avatar);
-        }
-        user.avatar = avatar;
-      } else {
-        const avatar = gravatarUrl(user.email || account.User.Name, {
-          default: 'mm',
-          size: 200,
-        });
-
-        if (avatar !== user.avatar) {
-          const avatarProxy = new ImageProxy('avatar', '');
-          avatarProxy.clearCachedImage(user.avatar);
-        }
-
-        user.avatar = avatar;
-      }
       user.jellyfinUsername = account.User.Name;
 
       if (user.username === account.User.Name) {
@@ -459,12 +455,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         jellyfinUserId: account.User.Id,
         jellyfinDeviceId: deviceId,
         permissions: settings.main.defaultPermissions,
-        avatar: account.User.PrimaryImageTag
+        avatar: `/avatarproxy/${account.User.Id}`,
-          ? `/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-          : gravatarUrl(body.email || account.User.Name, {
-              default: 'mm',
-              size: 200,
-            }),
         userType:
           settings.main.mediaServerType === MediaServerType.JELLYFIN
             ? UserType.JELLYFIN

server/routes/avatarproxy.ts

@@ -1,21 +1,39 @@
 import { MediaServerType } from '@server/constants/server';
+import { getRepository } from '@server/datasource';
+import { User } from '@server/entity/User';
 import ImageProxy from '@server/lib/imageproxy';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import { getAppVersion } from '@server/utils/appVersion';
 import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
+import gravatarUrl from 'gravatar-url';
 
 const router = Router();
 
-const avatarImageProxy = new ImageProxy('avatar', '');
+let _avatarImageProxy: ImageProxy | null = null;
-// Proxy avatar images
+async function initAvatarImageProxy() {
-router.get('/*', async (req, res) => {
+  if (!_avatarImageProxy) {
-  let imagePath = '';
+    const userRepository = getRepository(User);
+    const admin = await userRepository.findOne({
+      where: { id: 1 },
+      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+      order: { id: 'ASC' },
+    });
+    const deviceId = admin?.jellyfinDeviceId;
+    const authToken = getSettings().jellyfin.apiKey;
+    _avatarImageProxy = new ImageProxy('avatar', '', {
+      headers: {
+        'X-Emby-Authorization': `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`,
+      },
+    });
+  }
+  return _avatarImageProxy;
+}
+
+router.get('/:jellyfinUserId', async (req, res) => {
   try {
-    const jellyfinAvatar = req.url.match(
+    if (!req.params.jellyfinUserId.match(/^[a-f0-9]{32}$/)) {
-      /(\/Users\/\w+\/Images\/Primary\/?\?tag=\w+&quality=90)$/
-    )?.[1];
-    if (!jellyfinAvatar) {
       const mediaServerType = getSettings().main.mediaServerType;
       throw new Error(
         `Provided URL is not ${
@@ -26,10 +44,28 @@ router.get('/*', async (req, res) => {
       );
     }
 
-    const imageUrl = new URL(jellyfinAvatar, getHostname());
+    const avatarImageCache = await initAvatarImageProxy();
-    imagePath = imageUrl.toString();
 
-    const imageData = await avatarImageProxy.getImage(imagePath);
+    const user = await getRepository(User).findOne({
+      where: { jellyfinUserId: req.params.jellyfinUserId },
+    });
+
+    const fallbackUrl = gravatarUrl(user?.email || 'none', {
+      default: 'mm',
+      size: 200,
+    });
+    const jellyfinAvatarUrl = `${getHostname()}/UserImage?UserId=${
+      req.params.jellyfinUserId
+    }`;
+    let imageData = await avatarImageCache.getImage(
+      jellyfinAvatarUrl,
+      fallbackUrl
+    );
+
+    if (imageData.meta.extension === 'json') {
+      // this is a 404
+      imageData = await avatarImageCache.getImage(fallbackUrl);
+    }
 
     res.writeHead(200, {
       'Content-Type': `image/${imageData.meta.extension}`,
@@ -42,7 +78,6 @@ router.get('/*', async (req, res) => {
     res.end(imageData.imageBuffer);
   } catch (e) {
     logger.error('Failed to proxy avatar image', {
-      imagePath,
       errorMessage: e.message,
     });
   }

server/routes/imageproxy.ts

@@ -5,6 +5,7 @@ import { Router } from 'express';
 const router = Router();
 const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
   rateLimitOptions: {
+    maxRequests: 20,
     maxRPS: 50,
   },
 });

server/routes/index.ts

@@ -17,7 +17,11 @@ import { mapProductionCompany } from '@server/models/Movie';
 import { mapNetwork } from '@server/models/Tv';
 import settingsRoutes from '@server/routes/settings';
 import watchlistRoutes from '@server/routes/watchlist';
-import { appDataPath, appDataStatus } from '@server/utils/appDataVolume';
+import {
+  appDataPath,
+  appDataPermissions,
+  appDataStatus,
+} from '@server/utils/appDataVolume';
 import { getAppVersion, getCommitTag } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
 import { isPerson } from '@server/utils/typeHelpers';
@@ -93,6 +97,7 @@ router.get('/status/appdata', (_req, res) => {
   return res.status(200).json({
     appData: appDataStatus(),
     appDataPath: appDataPath(),
+    appDataPermissions: appDataPermissions(),
   });
 });
 

server/routes/service.ts

@@ -123,9 +123,13 @@ serviceRoutes.get<{ sonarrId: string }>(
     });
 
     try {
+      const systemStatus = await sonarr.getSystemStatus();
+      const sonarrMajorVersion = Number(systemStatus.version.split('.')[0]);
+
       const profiles = await sonarr.getProfiles();
       const rootFolders = await sonarr.getRootFolders();
-      const languageProfiles = await sonarr.getLanguageProfiles();
+      const languageProfiles =
+        sonarrMajorVersion <= 3 ? await sonarr.getLanguageProfiles() : null;
       const tags = await sonarr.getTags();
 
       return res.status(200).json({

server/routes/settings/index.ts

@@ -32,7 +32,6 @@ import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import fs from 'fs';
-import gravatarUrl from 'gravatar-url';
 import { escapeRegExp, merge, omit, set, sortBy } from 'lodash';
 import { rescheduleJob } from 'node-schedule';
 import path from 'path';
@@ -70,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.' });
@@ -119,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',
@@ -232,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);
 });
 
@@ -283,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', {
@@ -371,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);
 });
 
@@ -395,9 +394,7 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
   const users = resp.users.map((user) => ({
     username: user.Name,
     id: user.Id,
-    thumb: user.PrimaryImageTag
+    thumb: `/avatarproxy/${user.Id}`,
-      ? `/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`
-      : gravatarUrl(user.Name, { default: 'mm', size: 200 }),
     email: user.Name,
   }));
 
@@ -437,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',
@@ -698,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
     );
@@ -712,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;
 
@@ -769,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);
   }

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);
 });

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]);
 });

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);
 });
@@ -43,13 +43,14 @@ sonarrRoutes.post('/test', async (req, res, next) => {
       url: SonarrAPI.buildUrl(req.body, '/api/v3'),
     });
 
-    const urlBase = await sonarr
+    const systemStatus = await sonarr.getSystemStatus();
-      .getSystemStatus()
+    const sonarrMajorVersion = Number(systemStatus.version.split('.')[0]);
-      .then((value) => value.urlBase)
+
-      .catch(() => req.body.baseUrl);
+    const urlBase = systemStatus.urlBase;
     const profiles = await sonarr.getProfiles();
     const folders = await sonarr.getRootFolders();
-    const languageProfiles = await sonarr.getLanguageProfiles();
+    const languageProfiles =
+      sonarrMajorVersion <= 3 ? await sonarr.getLanguageProfiles() : null;
     const tags = await sonarr.getTags();
 
     return res.status(200).json({
@@ -72,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(
@@ -100,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(
@@ -119,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]);
 });

server/routes/user/index.ts

@@ -539,12 +539,7 @@ router.post(
             ).toString('base64'),
             email: jellyfinUser?.Name,
             permissions: settings.main.defaultPermissions,
-            avatar: jellyfinUser?.PrimaryImageTag
+            avatar: `/avatarproxy/${jellyfinUser?.Id}`,
-              ? `/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
-              : gravatarUrl(jellyfinUser?.Name ?? '', {
-                  default: 'mm',
-                  size: 200,
-                }),
             userType:
               settings.main.mediaServerType === MediaServerType.JELLYFIN
                 ? UserType.JELLYFIN

server/utils/appDataVolume.ts

@@ -1,4 +1,4 @@
-import { existsSync } from 'fs';
+import { accessSync, existsSync } from 'fs';
 import path from 'path';
 
 const CONFIG_PATH = process.env.CONFIG_DIRECTORY
@@ -14,3 +14,12 @@ export const appDataStatus = (): boolean => {
 export const appDataPath = (): string => {
   return CONFIG_PATH;
 };
+
+export const appDataPermissions = (): boolean => {
+  try {
+    accessSync(CONFIG_PATH);
+    return true;
+  } catch (err) {
+    return false;
+  }
+};

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;
+}

server/utils/rateLimit.ts

@@ -1,68 +0,0 @@
-export type RateLimitOptions = {
-  maxRPS: number;
-  id?: string;
-};
-
-type RateLimiteState<T extends (...args: Parameters<T>) => Promise<U>, U> = {
-  queue: {
-    args: Parameters<T>;
-    resolve: (value: U) => void;
-    reject: (reason?: unknown) => void;
-  }[];
-  lastTimestamps: number[];
-  timeout: ReturnType<typeof setTimeout>;
-};
-
-const rateLimitById: Record<string, unknown> = {};
-
-/**
- * Add a rate limit to a function so it doesn't exceed a maximum number of requests per second. Function calls exceeding the rate will be delayed.
- * @param fn The function to rate limit
- * @param options.maxRPS Maximum number of Requests Per Second
- * @param options.id An ID to share between rate limits, so it uses the same request queue.
- * @returns The function with a rate limit
- */
-export default function rateLimit<
-  T extends (...args: Parameters<T>) => Promise<U>,
-  U
->(fn: T, options: RateLimitOptions): (...args: Parameters<T>) => Promise<U> {
-  const state: RateLimiteState<T, U> = (rateLimitById[
-    options.id || ''
-  ] as RateLimiteState<T, U>) || { queue: [], lastTimestamps: [] };
-  if (options.id) {
-    rateLimitById[options.id] = state;
-  }
-
-  const processQueue = () => {
-    // remove old timestamps
-    state.lastTimestamps = state.lastTimestamps.filter(
-      (timestamp) => Date.now() - timestamp < 1000
-    );
-
-    if (state.lastTimestamps.length < options.maxRPS) {
-      // process requests if RPS not exceeded
-      const item = state.queue.shift();
-      if (!item) return;
-      state.lastTimestamps.push(Date.now());
-      const { args, resolve, reject } = item;
-      fn(...args)
-        .then(resolve)
-        .catch(reject);
-      processQueue();
-    } else {
-      // rerun once the oldest item in queue is older than 1s
-      if (state.timeout) clearTimeout(state.timeout);
-      state.timeout = setTimeout(
-        processQueue,
-        1000 - (Date.now() - state.lastTimestamps[0])
-      );
-    }
-  };
-
-  return (...args: Parameters<T>): Promise<U> => {
-    return new Promise<U>((resolve, reject) => {
-      state.queue.push({ args, resolve, reject });
-      processQueue();
-    });
-  };
-}

server/utils/restartFlag.ts

@@ -13,7 +13,8 @@ class RestartFlag {
 
     return (
       this.settings.csrfProtection !== settings.csrfProtection ||
-      this.settings.trustProxy !== settings.trustProxy
+      this.settings.trustProxy !== settings.trustProxy ||
+      this.settings.proxy.enabled !== settings.proxy.enabled
     );
   }
 }

src/components/Blacklist/index.tsx

@@ -23,6 +23,7 @@ import type {
 } from '@server/interfaces/api/blacklistInterfaces';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import type { ChangeEvent } from 'react';
@@ -238,11 +239,8 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
   const removeFromBlacklist = async (tmdbId: number, title?: string) => {
     setIsUpdating(true);
 
-    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
+    try {
-      method: 'DELETE',
+      await axios.delete('/api/v1/blacklist/' + tmdbId);
-    });
-
-    if (res.status === 204) {
       addToast(
         <span>
           {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
@@ -252,7 +250,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
         </span>,
         { appearance: 'success', autoDismiss: true }
       );
-    } else {
+    } catch {
       addToast(intl.formatMessage(globalMessages.blacklistError), {
         appearance: 'error',
         autoDismiss: true,

src/components/BlacklistBlock/index.tsx

@@ -6,6 +6,7 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { CalendarIcon, TrashIcon, UserIcon } from '@heroicons/react/24/solid';
 import type { Blacklist } from '@server/entity/Blacklist';
+import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -35,11 +36,8 @@ const BlacklistBlock = ({
   const removeFromBlacklist = async (tmdbId: number, title?: string) => {
     setIsUpdating(true);
 
-    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
+    try {
-      method: 'DELETE',
+      await axios.delete('/api/v1/blacklist/' + tmdbId);
-    });
-
-    if (res.status === 204) {
       addToast(
         <span>
           {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
@@ -49,7 +47,7 @@ const BlacklistBlock = ({
         </span>,
         { appearance: 'success', autoDismiss: true }
       );
-    } else {
+    } catch {
       addToast(intl.formatMessage(globalMessages.blacklistError), {
         appearance: 'error',
         autoDismiss: true,

src/components/Common/CachedImage/index.tsx

@@ -25,11 +25,8 @@ const CachedImage = ({ src, type, ...props }: CachedImageProps) => {
         ? src.replace(/^https:\/\/image\.tmdb\.org\//, '/imageproxy/')
         : src;
   } else if (type === 'avatar') {
-    // jellyfin avatar (in any)
+    // jellyfin avatar (if any)
-    const jellyfinAvatar = src.match(
+    imageUrl = src;
-      /(\/Users\/\w+\/Images\/Primary\/?\?tag=\w+&quality=90)$/
-    )?.[1];
-    imageUrl = jellyfinAvatar ? `/avatarproxy` + jellyfinAvatar : src;
   } else {
     return null;
   }

src/components/Discover/CreateSlider/index.tsx

@@ -14,6 +14,7 @@ import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import type { Keyword, ProductionCompany } from '@server/models/common';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -76,9 +77,11 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
 
         const keywords = await Promise.all(
           slider.data.split(',').map(async (keywordId) => {
-            const res = await fetch(`/api/v1/keyword/${keywordId}`);
+            const keyword = await axios.get<Keyword>(
-            const keyword: Keyword = await res.json();
+              `/api/v1/keyword/${keywordId}`
-            return keyword;
+            );
+
+            return keyword.data;
           })
         );
 
@@ -95,13 +98,15 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
           return;
         }
 
-        const res = await fetch(
+        const response = await axios.get<TmdbGenre[]>(
           `/api/v1/genres/${
             slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE ? 'movie' : 'tv'
           }`
         );
-        const genres: TmdbGenre[] = await res.json();
+
-        const genre = genres.find((genre) => genre.id === Number(slider.data));
+        const genre = response.data.find(
+          (genre) => genre.id === Number(slider.data)
+        );
 
         setDefaultDataValue([
           {
@@ -116,8 +121,11 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
           return;
         }
 
-        const res = await fetch(`/api/v1/studio/${slider.data}`);
+        const response = await axios.get<ProductionCompany>(
-        const studio: ProductionCompany = await res.json();
+          `/api/v1/studio/${slider.data}`
+        );
+
+        const studio = response.data;
 
         setDefaultDataValue([
           {
@@ -160,17 +168,16 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
   );
 
   const loadKeywordOptions = async (inputValue: string) => {
-    const res = await fetch(
+    const results = await axios.get<TmdbKeywordSearchResponse>(
-      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`,
+      '/api/v1/search/keyword',
       {
-        headers: {
+        params: {
-          'Content-Type': 'application/json',
+          query: encodeURIExtraParams(inputValue),
         },
       }
     );
-    const results: TmdbKeywordSearchResponse = await res.json();
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));
@@ -181,37 +188,38 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
       return [];
     }
 
-    const res = await fetch(
+    const results = await axios.get<TmdbCompanySearchResponse>(
-      `/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`,
+      '/api/v1/search/company',
       {
-        headers: {
+        params: {
-          'Content-Type': 'application/json',
+          query: encodeURIExtraParams(inputValue),
         },
       }
     );
-    const results: TmdbCompanySearchResponse = await res.json();
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));
   };
 
   const loadMovieGenreOptions = async () => {
-    const res = await fetch('/api/v1/discover/genreslider/movie');
+    const results = await axios.get<GenreSliderItem[]>(
-    const results: GenreSliderItem[] = await res.json();
+      '/api/v1/discover/genreslider/movie'
+    );
 
-    return results.map((result) => ({
+    return results.data.map((result) => ({
       label: result.name,
       value: result.id,
     }));
   };
 
   const loadTvGenreOptions = async () => {
-    const res = await fetch('/api/v1/discover/genreslider/tv');
+    const results = await axios.get<GenreSliderItem[]>(
-    const results: GenreSliderItem[] = await res.json();
+      '/api/v1/discover/genreslider/tv'
+    );
 
-    return results.map((result) => ({
+    return results.data.map((result) => ({
       label: result.name,
       value: result.id,
     }));
@@ -306,31 +314,17 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
       onSubmit={async (values, { resetForm }) => {
         try {
           if (slider) {
-            const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
+            await axios.put(`/api/v1/settings/discover/${slider.id}`, {
-              method: 'PUT',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
               type: Number(values.sliderType),
               title: values.title,
               data: values.data,
-              }),
             });
-            if (!res.ok) throw new Error();
           } else {
-            const res = await fetch('/api/v1/settings/discover/add', {
+            await axios.post('/api/v1/settings/discover/add', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
               type: Number(values.sliderType),
               title: values.title,
               data: values.data,
-              }),
             });
-            if (!res.ok) throw new Error();
           }
 
           addToast(

src/components/Discover/DiscoverSliderEdit/index.tsx

@@ -20,6 +20,7 @@ import {
 } from '@heroicons/react/24/solid';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
+import axios from 'axios';
 import { useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-aria';
 import { useIntl } from 'react-intl';
@@ -77,10 +78,7 @@ const DiscoverSliderEdit = ({
 
   const deleteSlider = async () => {
     try {
-      const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
+      await axios.delete(`/api/v1/settings/discover/${slider.id}`);
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
       addToast(intl.formatMessage(messages.deletesuccess), {
         appearance: 'success',
         autoDismiss: true,

src/components/Discover/index.tsx

@@ -28,6 +28,7 @@ import {
 } from '@heroicons/react/24/solid';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
+import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -75,14 +76,7 @@ const Discover = () => {
 
   const updateSliders = async () => {
     try {
-      const res = await fetch('/api/v1/settings/discover', {
+      await axios.post('/api/v1/settings/discover', sliders);
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(sliders),
-      });
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.updatesuccess), {
         appearance: 'success',
@@ -100,10 +94,7 @@ const Discover = () => {
 
   const resetSliders = async () => {
     try {
-      const res = await fetch('/api/v1/settings/discover/reset', {
+      await axios.get('/api/v1/settings/discover/reset');
-        method: 'GET',
-      });
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.resetsuccess), {
         appearance: 'success',

src/components/IssueDetails/IssueComment/index.tsx

@@ -6,6 +6,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
 import type { default as IssueCommentType } from '@server/entity/IssueComment';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { Fragment, useState } from 'react';
@@ -48,10 +49,7 @@ const IssueComment = ({
 
   const deleteComment = async () => {
     try {
-      const res = await fetch(`/api/v1/issueComment/${comment.id}`, {
+      await axios.delete(`/api/v1/issueComment/${comment.id}`);
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
     } catch (e) {
       // something went wrong deleting the comment
     } finally {
@@ -178,17 +176,9 @@ const IssueComment = ({
               <Formik
                 initialValues={{ newMessage: comment.message }}
                 onSubmit={async (values) => {
-                  const res = await fetch(
+                  await axios.put(`/api/v1/issueComment/${comment.id}`, {
-                    `/api/v1/issueComment/${comment.id}`,
+                    message: values.newMessage,
-                    {
+                  });
-                      method: 'PUT',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
-                      body: JSON.stringify({ message: values.newMessage }),
-                    }
-                  );
-                  if (!res.ok) throw new Error();
 
                   if (onUpdate) {
                     onUpdate();

src/components/IssueDetails/index.tsx

@@ -11,7 +11,7 @@ import useDeepLinks from '@app/hooks/useDeepLinks';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import ErrorPage from '@app/pages/_error';
+import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import {
@@ -27,6 +27,7 @@ import { MediaServerType } from '@server/constants/server';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
@@ -112,7 +113,7 @@ const IssueDetails = () => {
   }
 
   if (!data || !issueData) {
-    return <ErrorPage statusCode={404} />;
+    return <Error statusCode={404} />;
   }
 
   const belongsToUser = issueData.createdBy.id === currentUser?.id;
@@ -121,14 +122,9 @@ const IssueDetails = () => {
 
   const editFirstComment = async (newMessage: string) => {
     try {
-      const res = await fetch(`/api/v1/issueComment/${firstComment.id}`, {
+      await axios.put(`/api/v1/issueComment/${firstComment.id}`, {
-        method: 'PUT',
+        message: newMessage,
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ message: newMessage }),
       });
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.toasteditdescriptionsuccess), {
         appearance: 'success',
@@ -145,10 +141,7 @@ const IssueDetails = () => {
 
   const updateIssueStatus = async (newStatus: 'open' | 'resolved') => {
     try {
-      const res = await fetch(`/api/v1/issue/${issueData.id}/${newStatus}`, {
+      await axios.post(`/api/v1/issue/${issueData.id}/${newStatus}`);
-        method: 'POST',
-      });
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.toaststatusupdated), {
         appearance: 'success',
@@ -165,10 +158,7 @@ const IssueDetails = () => {
 
   const deleteIssue = async () => {
     try {
-      const res = await fetch(`/api/v1/issue/${issueData.id}`, {
+      await axios.delete(`/api/v1/issue/${issueData.id}`);
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.toastissuedeleted), {
         appearance: 'success',
@@ -502,17 +492,9 @@ const IssueDetails = () => {
                 }}
                 validationSchema={CommentSchema}
                 onSubmit={async (values, { resetForm }) => {
-                  const res = await fetch(
+                  await axios.post(`/api/v1/issue/${issueData?.id}/comment`, {
-                    `/api/v1/issue/${issueData?.id}/comment`,
+                    message: values.message,
-                    {
+                  });
-                      method: 'POST',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
-                      body: JSON.stringify({ message: values.message }),
-                    }
-                  );
-                  if (!res.ok) throw new Error();
                   revalidateIssue();
                   resetForm();
                 }}

src/components/IssueModal/CreateIssueModal/index.tsx

@@ -11,6 +11,7 @@ import { MediaStatus } from '@server/constants/media';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { Field, Formik } from 'formik';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
@@ -100,22 +101,14 @@ const CreateIssueModal = ({
       validationSchema={CreateIssueModalSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/issue', {
+          const newIssue = await axios.post<Issue>('/api/v1/issue', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             issueType: values.selectedIssue.issueType,
             message: values.message,
             mediaId: data?.mediaInfo?.id,
             problemSeason: values.problemSeason,
             problemEpisode:
               values.problemSeason > 0 ? values.problemEpisode : 0,
-            }),
           });
-          if (!res.ok) throw new Error();
-          const newIssue: Issue = await res.json();
 
           if (data) {
             addToast(
@@ -126,7 +119,7 @@ const CreateIssueModal = ({
                     strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
                   })}
                 </div>
-                <Link href={`/issues/${newIssue.id}`} legacyBehavior>
+                <Link href={`/issues/${newIssue.data.id}`} legacyBehavior>
                   <Button as="a" className="mt-4">
                     <span>{intl.formatMessage(messages.toastviewissue)}</span>
                     <ArrowRightCircleIcon />

src/components/Layout/UserDropdown/index.tsx

@@ -8,6 +8,7 @@ import {
   ClockIcon,
 } from '@heroicons/react/24/outline';
 import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
+import axios from 'axios';
 import type { LinkProps } from 'next/link';
 import Link from 'next/link';
 import { forwardRef, Fragment } from 'react';
@@ -38,13 +39,9 @@ const UserDropdown = () => {
   const { user, revalidate } = useUser();
 
   const logout = async () => {
-    const res = await fetch('/api/v1/auth/logout', {
+    const response = await axios.post('/api/v1/auth/logout');
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
 
-    if (data?.status === 'ok') {
+    if (response.data?.status === 'ok') {
       revalidate();
     }
   };

src/components/Login/AddEmailModal.tsx

@@ -2,6 +2,7 @@ import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
+import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import * as Yup from 'yup';
@@ -57,18 +58,11 @@ const AddEmailModal: React.FC<AddEmailModalProps> = ({
         validationSchema={EmailSettingsSchema}
         onSubmit={async (values) => {
           try {
-            const res = await fetch('/api/v1/auth/jellyfin', {
+            await axios.post('/api/v1/auth/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
               username: username,
               password: password,
               email: values.email,
-              }),
             });
-            if (!res.ok) throw new Error();
 
             onSave();
           } catch (e) {

src/components/Login/JellyfinLogin.tsx

@@ -5,6 +5,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { InformationCircleIcon } from '@heroicons/react/24/solid';
 import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType, ServerType } from '@server/constants/server';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -113,13 +114,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
             // if (serverType !== 'Jellyfin' && serverType !== 'Emby') {
             //   throw new Error('Invalid serverType'); // You can customize the error message
             // }
-
+            await axios.post('/api/v1/auth/jellyfin', {
-            const res = await fetch('/api/v1/auth/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
               username: values.username,
               password: values.password,
               hostname: values.hostname,
@@ -128,9 +123,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
               urlBase: values.urlBase,
               email: values.email,
               serverType: serverType,
-              }),
             });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
           } catch (e) {
             let errorData;
             try {
@@ -370,18 +363,11 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
           validationSchema={LoginSchema}
           onSubmit={async (values) => {
             try {
-              const res = await fetch('/api/v1/auth/jellyfin', {
+              await axios.post('/api/v1/auth/jellyfin', {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
                 username: values.username,
                 password: values.password,
                 email: values.username,
-                }),
               });
-              if (!res.ok) throw new Error();
             } catch (e) {
               toasts.addToast(
                 intl.formatMessage(

src/components/Login/LocalLogin.tsx

@@ -6,6 +6,7 @@ import {
   ArrowLeftOnRectangleIcon,
   LifebuoyIcon,
 } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useState } from 'react';
@@ -55,17 +56,10 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
       validationSchema={LoginSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/auth/local', {
+          await axios.post('/api/v1/auth/local', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             email: values.email,
             password: values.password,
-            }),
           });
-          if (!res.ok) throw new Error();
         } catch (e) {
           setLoginError(intl.formatMessage(messages.loginerror));
         } finally {

src/components/Login/index.tsx

@@ -10,6 +10,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
+import axios from 'axios';
 import { useRouter } from 'next/dist/client/router';
 import Image from 'next/image';
 import { useEffect, useState } from 'react';
@@ -41,17 +42,9 @@ const Login = () => {
     const login = async () => {
       setProcessing(true);
       try {
-        const res = await fetch('/api/v1/auth/plex', {
+        const response = await axios.post('/api/v1/auth/plex', { authToken });
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({ authToken }),
-        });
-        if (!res.ok) throw new Error(res.statusText, { cause: res });
-        const data = await res.json();
 
-        if (data?.id) {
+        if (response.data?.id) {
           revalidate();
         }
       } catch (e) {

src/components/ManageSlideOver/index.tsx

@@ -28,6 +28,7 @@ import type { MediaWatchDataResponse } from '@server/interfaces/api/mediaInterfa
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
 import useSWR from 'swr';
@@ -111,10 +112,7 @@ const ManageSlideOver = ({
 
   const deleteMedia = async () => {
     if (data.mediaInfo) {
-      const res = await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
+      await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
       revalidate();
       onClose();
     }
@@ -122,16 +120,8 @@ const ManageSlideOver = ({
 
   const deleteMediaFile = async () => {
     if (data.mediaInfo) {
-      const res1 = await fetch(`/api/v1/media/${data.mediaInfo.id}/file`, {
+      await axios.delete(`/api/v1/media/${data.mediaInfo.id}/file`);
-        method: 'DELETE',
+      await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
-      });
-      if (!res1.ok) throw new Error();
-
-      const res2 = await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
-        method: 'DELETE',
-      });
-      if (!res2.ok) throw new Error();
-
       revalidate();
       onClose();
     }
@@ -160,16 +150,9 @@ const ManageSlideOver = ({
 
   const markAvailable = async (is4k = false) => {
     if (data.mediaInfo) {
-      const res = await fetch(`/api/v1/media/${data.mediaInfo?.id}/available`, {
+      await axios.post(`/api/v1/media/${data.mediaInfo?.id}/available`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
         is4k,
-        }),
       });
-      if (!res.ok) throw new Error();
       revalidate();
     }
   };

src/components/MovieDetails/index.tsx

@@ -52,6 +52,7 @@ import { IssueStatus } from '@server/constants/issue';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
+import axios from 'axios';
 import { countries } from 'country-flag-icons';
 import 'country-flag-icons/3x2/flags.css';
 import { uniqBy } from 'lodash';
@@ -313,32 +314,14 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   const onClickWatchlistBtn = async (): Promise<void> => {
     setIsUpdating(true);
 
-    const res = await fetch('/api/v1/watchlist', {
+    try {
-      method: 'POST',
+      const watchlist = await axios.post('/api/v1/watchlist', {
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
         tmdbId: movie?.id,
         mediaType: MediaType.MOVIE,
         title: movie?.title,
-      }),
       });
 
-    if (!res.ok) {
+      if (watchlist.data) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    const data = await res.json();
-
-    if (data) {
         addToast(
           <span>
             {intl.formatMessage(messages.watchlistSuccess, {
@@ -349,6 +332,15 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           { appearance: 'success', autoDismiss: true }
         );
       }
+    } catch {
+      addToast(intl.formatMessage(messages.watchlistError), {
+        appearance: 'error',
+        autoDismiss: true,
+      });
+
+      setIsUpdating(false);
+      return;
+    }
 
     setIsUpdating(false);
     setToggleWatchlist((prevState) => !prevState);
@@ -357,12 +349,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   const onClickDeleteWatchlistBtn = async (): Promise<void> => {
     setIsUpdating(true);
     try {
-      const res = await fetch(`/api/v1/watchlist/${movie?.id}`, {
+      await axios.delete(`/api/v1/watchlist/${movie?.id}`);
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
 
-      if (res.status === 204) {
       addToast(
         <span>
           {intl.formatMessage(messages.watchlistDeleted, {
@@ -372,7 +360,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
         </span>,
         { appearance: 'info', autoDismiss: true }
       );
-      }
     } catch (e) {
       addToast(intl.formatMessage(messages.watchlistError), {
         appearance: 'error',
@@ -387,7 +374,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   const onClickHideItemBtn = async (): Promise<void> => {
     setIsBlacklistUpdating(true);
 
-    const res = await fetch('/api/v1/blacklist', {
+    try {
+      await axios.post('/api/v1/blacklist', {
         method: 'POST',
         headers: {
           Accept: 'application/json',
@@ -401,7 +389,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
         }),
       });
 
-    if (res.status === 201) {
       addToast(
         <span>
           {intl.formatMessage(globalMessages.blacklistSuccess, {
@@ -413,7 +400,8 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
       );
 
       revalidate();
-    } else if (res.status === 412) {
+    } catch (e) {
+      if (e?.response?.status === 412) {
         addToast(
           <span>
             {intl.formatMessage(globalMessages.blacklistDuplicateError, {
@@ -429,6 +417,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           autoDismiss: true,
         });
       }
+    }
 
     setIsBlacklistUpdating(false);
     closeBlacklistModal();

src/components/RequestBlock/index.tsx

@@ -17,6 +17,7 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
+import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -52,10 +53,7 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
 
   const updateRequest = async (type: 'approve' | 'decline'): Promise<void> => {
     setIsUpdating(true);
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+    await axios.post(`/api/v1/request/${request.id}/${type}`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
 
     if (onUpdate) {
       onUpdate();
@@ -65,10 +63,7 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
 
   const deleteRequest = async () => {
     setIsUpdating(true);
-    const res = await fetch(`/api/v1/request/${request.id}`, {
+    await axios.delete(`/api/v1/request/${request.id}`);
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
 
     if (onUpdate) {
       onUpdate();

src/components/RequestButton/index.tsx

@@ -13,6 +13,7 @@ import {
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type Media from '@server/entity/Media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
+import axios from 'axios';
 import { useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 
@@ -93,13 +94,9 @@ const RequestButton = ({
     request: MediaRequest,
     type: 'approve' | 'decline'
   ) => {
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
 
-    if (data) {
+    if (response) {
       onUpdate();
     }
   };
@@ -114,11 +111,7 @@ const RequestButton = ({
 
     await Promise.all(
       requests.map(async (request) => {
-        const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+        return axios.post(`/api/v1/request/${request.id}/${type}`);
-          method: 'POST',
-        });
-        if (!res.ok) throw new Error();
-        return res.json();
       })
     );
 

src/components/RequestCard/index.tsx

@@ -22,6 +22,7 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -73,10 +74,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
   });
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/media/${requestData?.media.id}`, {
+    await axios.delete(`/api/v1/media/${requestData?.media.id}`);
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
     mutate('/api/v1/media?filter=allavailable&take=20&sort=mediaAdded');
     mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
   };
@@ -261,22 +259,15 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
   });
 
   const modifyRequest = async (type: 'approve' | 'decline') => {
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
 
-    if (data) {
+    if (response) {
       revalidate();
     }
   };
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/request/${request.id}`, {
+    await axios.delete(`/api/v1/request/${request.id}`);
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
     mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
   };
 
@@ -284,13 +275,9 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
     setRetrying(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${request.id}/retry`, {
+      const response = await axios.post(`/api/v1/request/${request.id}/retry`);
-        method: 'POST',
-      });
-      if (!res.ok) throw new Error();
-      const data = await res.json();
 
-      if (data) {
+      if (response) {
         revalidate();
       }
     } catch (e) {

src/components/RequestList/RequestItem/index.tsx

@@ -21,6 +21,7 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -63,10 +64,7 @@ const RequestItemError = ({
   const { hasPermission } = useUser();
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/media/${requestData?.media.id}`, {
+    await axios.delete(`/api/v1/media/${requestData?.media.id}`);
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
     revalidateList();
   };
 
@@ -324,34 +322,27 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
   const [isRetrying, setRetrying] = useState(false);
 
   const modifyRequest = async (type: 'approve' | 'decline') => {
-    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
-    const data = await res.json();
 
-    if (data) {
+    if (response) {
       revalidate();
     }
   };
 
   const deleteRequest = async () => {
-    const res = await fetch(`/api/v1/request/${request.id}`, {
+    await axios.delete(`/api/v1/request/${request.id}`);
-      method: 'DELETE',
-    });
-    if (!res.ok) throw new Error();
 
     revalidateList();
   };
 
   const deleteMediaFile = async () => {
     if (request.media) {
-      await fetch(`/api/v1/media/${request.media.id}/file`, {
+      try {
-        method: 'DELETE',
+        await axios.delete(`/api/v1/media/${request.media.id}/file`);
-      });
+        await axios.delete(`/api/v1/media/${request.media.id}`);
-      await fetch(`/api/v1/media/${request.media.id}`, {
+      } catch {
-        method: 'DELETE',
+        /* empty */
-      });
+      }
       revalidateList();
     }
   };
@@ -360,12 +351,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
     setRetrying(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${request.id}/retry`, {
+      const result = await axios.post(`/api/v1/request/${request.id}/retry`);
-        method: 'POST',
-      });
-      if (!res.ok) throw new Error();
-      const result = await res.json();
-
       revalidate(result.data);
     } catch (e) {
       addToast(intl.formatMessage(messages.failedretry), {

src/components/RequestModal/CollectionRequestModal.tsx

@@ -13,6 +13,7 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { Collection } from '@server/models/Collection';
+import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -198,19 +199,12 @@ const CollectionRequestModal = ({
         (
           data?.parts.filter((part) => selectedParts.includes(part.id)) ?? []
         ).map(async (part) => {
-          const res = await fetch('/api/v1/request', {
+          await axios.post<MediaRequest>('/api/v1/request', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             mediaId: part.id,
             mediaType: 'movie',
             is4k,
             ...overrideParams,
-            }),
           });
-          if (!res.ok) throw new Error();
         })
       );
 

src/components/RequestModal/MovieRequestModal.tsx

@@ -12,6 +12,7 @@ import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { MovieDetails } from '@server/models/Movie';
+import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -89,23 +90,15 @@ const MovieRequestModal = ({
           tags: requestOverrides.tags,
         };
       }
-      const res = await fetch('/api/v1/request', {
+      const response = await axios.post<MediaRequest>('/api/v1/request', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
         mediaId: data?.id,
         mediaType: 'movie',
         is4k,
         ...overrideParams,
-        }),
       });
-      if (!res.ok) throw new Error();
-      const mediaRequest: MediaRequest = await res.json();
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
-      if (mediaRequest) {
+      if (response.data) {
         if (onComplete) {
           onComplete(
             hasPermission(
@@ -144,14 +137,12 @@ const MovieRequestModal = ({
     setIsUpdating(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
+      const response = await axios.delete<MediaRequest>(
-        method: 'DELETE',
+        `/api/v1/request/${editRequest?.id}`
-      });
+      );
-      if (!res.ok) throw new Error();
-
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
-      if (res.status === 204) {
+      if (response.status === 204) {
         if (onComplete) {
           onComplete(MediaStatus.UNKNOWN);
         }
@@ -174,27 +165,17 @@ const MovieRequestModal = ({
     setIsUpdating(true);
 
     try {
-      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
+      await axios.put(`/api/v1/request/${editRequest?.id}`, {
-        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
         mediaType: 'movie',
         serverId: requestOverrides?.server,
         profileId: requestOverrides?.profile,
         rootFolder: requestOverrides?.folder,
         userId: requestOverrides?.user?.id,
         tags: requestOverrides?.tags,
-        }),
       });
-      if (!res.ok) throw new Error();
 
       if (alsoApproveRequest) {
-        const res = await fetch(`/api/v1/request/${editRequest?.id}/approve`, {
+        await axios.post(`/api/v1/request/${editRequest?.id}/approve`);
-          method: 'POST',
-        });
-        if (!res.ok) throw new Error();
       }
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 

src/components/RequestModal/TvRequestModal.tsx

@@ -17,6 +17,7 @@ import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -111,12 +112,7 @@ const TvRequestModal = ({
 
     try {
       if (selectedSeasons.length > 0) {
-        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
+        await axios.put(`/api/v1/request/${editRequest.id}`, {
-          method: 'PUT',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
           mediaType: 'tv',
           serverId: requestOverrides?.server,
           profileId: requestOverrides?.profile,
@@ -125,21 +121,13 @@ const TvRequestModal = ({
           userId: requestOverrides?.user?.id,
           tags: requestOverrides?.tags,
           seasons: selectedSeasons,
-          }),
         });
-        if (!res.ok) throw new Error();
 
         if (alsoApproveRequest) {
-          const res = await fetch(`/api/v1/request/${editRequest.id}/approve`, {
+          await axios.post(`/api/v1/request/${editRequest.id}/approve`);
-            method: 'POST',
-          });
-          if (!res.ok) throw new Error();
         }
       } else {
-        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
+        await axios.delete(`/api/v1/request/${editRequest.id}`);
-          method: 'DELETE',
-        });
-        if (!res.ok) throw new Error();
       }
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
@@ -204,12 +192,7 @@ const TvRequestModal = ({
           tags: requestOverrides.tags,
         };
       }
-      const res = await fetch('/api/v1/request', {
+      const response = await axios.post<MediaRequest>('/api/v1/request', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
         mediaId: data?.id,
         tvdbId: tvdbId ?? data?.externalIds.tvdbId,
         mediaType: 'tv',
@@ -220,16 +203,12 @@ const TvRequestModal = ({
               (season) => !getAllRequestedSeasons().includes(season)
             ),
         ...overrideParams,
-        }),
       });
-      if (!res.ok) throw new Error();
-      const mediaRequest: MediaRequest = await res.json();
-
       mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
 
-      if (mediaRequest) {
+      if (response.data) {
         if (onComplete) {
-          onComplete(mediaRequest.media.status);
+          onComplete(response.data.media.status);
         }
         addToast(
           <span>

src/components/ResetPassword/RequestResetLink.tsx

@@ -4,6 +4,7 @@ import PageTitle from '@app/components/Common/PageTitle';
 import LanguagePicker from '@app/components/Layout/LanguagePicker';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowLeftIcon, EnvelopeIcon } from '@heroicons/react/24/solid';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -84,18 +85,14 @@ const ResetPassword = () => {
                 }}
                 validationSchema={ResetSchema}
                 onSubmit={async (values) => {
-                  const res = await fetch(`/api/v1/auth/reset-password`, {
+                  const response = await axios.post(
-                    method: 'POST',
+                    `/api/v1/auth/reset-password`,
-                    headers: {
+                    {
-                      'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
                       email: values.email,
-                    }),
+                    }
-                  });
+                  );
-                  if (!res.ok) throw new Error();
 
-                  if (res.status === 200) {
+                  if (response.status === 200) {
                     setSubmitted(true);
                   }
                 }}

src/components/ResetPassword/index.tsx

@@ -5,6 +5,7 @@ import LanguagePicker from '@app/components/Layout/LanguagePicker';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { LifebuoyIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Form, Formik } from 'formik';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -99,21 +100,14 @@ const ResetPassword = () => {
                 }}
                 validationSchema={ResetSchema}
                 onSubmit={async (values) => {
-                  const res = await fetch(
+                  const response = await axios.post(
                     `/api/v1/auth/reset-password/${guid}`,
                     {
-                      method: 'POST',
-                      headers: {
-                        'Content-Type': 'application/json',
-                      },
-                      body: JSON.stringify({
                       password: values.password,
-                      }),
                     }
                   );
-                  if (!res.ok) throw new Error();
 
-                  if (res.status === 200) {
+                  if (response.status === 200) {
                     setSubmitted(true);
                   }
                 }}

src/components/Selector/index.tsx

@@ -18,6 +18,7 @@ import type {
   ProductionCompany,
   WatchProviderDetails,
 } from '@server/models/common';
+import axios from 'axios';
 import { orderBy } from 'lodash';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -75,9 +76,11 @@ export const CompanySelector = ({
         return;
       }
 
-      const res = await fetch(`/api/v1/studio/${defaultValue}`);
+      const response = await axios.get<ProductionCompany>(
-      if (!res.ok) throw new Error();
+        `/api/v1/studio/${defaultValue}`
-      const studio: ProductionCompany = await res.json();
+      );
+
+      const studio = response.data;
 
       setDefaultDataValue([
         {
@@ -95,15 +98,16 @@ export const CompanySelector = ({
       return [];
     }
 
-    const res = await fetch(
+    const results = await axios.get<TmdbCompanySearchResponse>(
-      `/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`
+      '/api/v1/search/company',
-    );
+      {
-    if (!res.ok) {
+        params: {
-      throw new Error('Network response was not ok');
+          query: encodeURIExtraParams(inputValue),
+        },
       }
-    const results: TmdbCompanySearchResponse = await res.json();
+    );
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));
@@ -157,15 +161,11 @@ export const GenreSelector = ({
 
       const genres = defaultValue.split(',');
 
-      const res = await fetch(`/api/v1/genres/${type}`);
+      const response = await axios.get<TmdbGenre[]>(`/api/v1/genres/${type}`);
-      if (!res.ok) {
-        throw new Error('Network response was not ok');
-      }
-      const response: TmdbGenre[] = await res.json();
 
       const genreData = genres
-        .filter((genre) => response.find((gd) => gd.id === Number(genre)))
+        .filter((genre) => response.data.find((gd) => gd.id === Number(genre)))
-        .map((g) => response.find((gd) => gd.id === Number(g)))
+        .map((g) => response.data.find((gd) => gd.id === Number(g)))
         .map((g) => ({
           label: g?.name ?? '',
           value: g?.id ?? 0,
@@ -178,11 +178,11 @@ export const GenreSelector = ({
   }, [defaultValue, type]);
 
   const loadGenreOptions = async (inputValue: string) => {
-    const res = await fetch(`/api/v1/discover/genreslider/${type}`);
+    const results = await axios.get<GenreSliderItem[]>(
-    if (!res.ok) throw new Error();
+      `/api/v1/discover/genreslider/${type}`
-    const results: GenreSliderItem[] = await res.json();
+    );
 
-    return results
+    return results.data
       .map((result) => ({
         label: result.name,
         value: result.id,
@@ -298,13 +298,11 @@ export const KeywordSelector = ({
 
       const keywords = await Promise.all(
         defaultValue.split(',').map(async (keywordId) => {
-          const res = await fetch(`/api/v1/keyword/${keywordId}`);
+          const keyword = await axios.get<Keyword>(
-          if (!res.ok) {
+            `/api/v1/keyword/${keywordId}`
-            throw new Error('Network response was not ok');
+          );
-          }
-          const keyword: Keyword = await res.json();
 
-          return keyword;
+          return keyword.data;
         })
       );
 
@@ -320,15 +318,16 @@ export const KeywordSelector = ({
   }, [defaultValue]);
 
   const loadKeywordOptions = async (inputValue: string) => {
-    const res = await fetch(
+    const results = await axios.get<TmdbKeywordSearchResponse>(
-      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`
+      '/api/v1/search/keyword',
-    );
+      {
-    if (!res.ok) {
+        params: {
-      throw new Error('Network response was not ok');
+          query: encodeURIExtraParams(inputValue),
+        },
       }
-    const results: TmdbKeywordSearchResponse = await res.json();
+    );
 
-    return results.results.map((result) => ({
+    return results.data.results.map((result) => ({
       label: result.name,
       value: result.id,
     }));

src/components/ServiceWorkerSetup/index.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable no-console */
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
+import axios from 'axios';
 import { useEffect } from 'react';
 
 const ServiceWorkerSetup = () => {
@@ -25,18 +26,11 @@ const ServiceWorkerSetup = () => {
             const parsedSub = JSON.parse(JSON.stringify(sub));
 
             if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
-              const res = await fetch('/api/v1/user/registerPushSubscription', {
+              await axios.post('/api/v1/user/registerPushSubscription', {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
                 endpoint: parsedSub.endpoint,
                 p256dh: parsedSub.keys.p256dh,
                 auth: parsedSub.keys.auth,
-                }),
               });
-              if (!res.ok) throw new Error();
             }
           }
         })

src/components/Settings/Notifications/NotificationsDiscord.tsx

@@ -5,6 +5,7 @@ import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -72,12 +73,7 @@ const NotificationsDiscord = () => {
       validationSchema={NotificationsDiscordSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/discord', {
+          await axios.post('/api/v1/settings/notifications/discord', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
@@ -86,9 +82,7 @@ const NotificationsDiscord = () => {
               webhookUrl: values.webhookUrl,
               enableMentions: values.enableMentions,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
 
           addToast(intl.formatMessage(messages.discordsettingssaved), {
             appearance: 'success',
@@ -127,14 +121,7 @@ const NotificationsDiscord = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/discord/test', {
-              '/api/v1/settings/notifications/discord/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
@@ -143,10 +130,7 @@ const NotificationsDiscord = () => {
                 webhookUrl: values.webhookUrl,
                 enableMentions: values.enableMentions,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsEmail.tsx

@@ -5,6 +5,7 @@ import SettingsBadge from '@app/components/Settings/SettingsBadge';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -147,12 +148,7 @@ const NotificationsEmail = () => {
       validationSchema={NotificationsEmailSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/email', {
+          await axios.post('/api/v1/settings/notifications/email', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             options: {
               userEmailRequired: values.userEmailRequired,
@@ -169,9 +165,7 @@ const NotificationsEmail = () => {
               pgpPrivateKey: values.pgpPrivateKey,
               pgpPassword: values.pgpPassword,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           mutate('/api/v1/settings/public');
 
           addToast(intl.formatMessage(messages.emailsettingssaved), {
@@ -203,14 +197,7 @@ const NotificationsEmail = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/email/test', {
-              '/api/v1/settings/notifications/email/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               options: {
                 emailFrom: values.emailFrom,
@@ -225,10 +212,7 @@ const NotificationsEmail = () => {
                 pgpPrivateKey: values.pgpPrivateKey,
                 pgpPassword: values.pgpPassword,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsGotify/index.tsx

@@ -4,6 +4,7 @@ import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/solid';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -82,21 +83,14 @@ const NotificationsGotify = () => {
       validationSchema={NotificationsGotifySchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/gotify', {
+          await axios.post('/api/v1/settings/notifications/gotify', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
               url: values.url,
               token: values.token,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           addToast(intl.formatMessage(messages.gotifysettingssaved), {
             appearance: 'success',
             autoDismiss: true,
@@ -134,24 +128,14 @@ const NotificationsGotify = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/gotify/test', {
-              '/api/v1/settings/notifications/gotify/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
                 url: values.url,
                 token: values.token,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsLunaSea/index.tsx

@@ -4,6 +4,7 @@ import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -68,21 +69,14 @@ const NotificationsLunaSea = () => {
       validationSchema={NotificationsLunaSeaSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/lunasea', {
+          await axios.post('/api/v1/settings/notifications/lunasea', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
               webhookUrl: values.webhookUrl,
               profileName: values.profileName,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           addToast(intl.formatMessage(messages.settingsSaved), {
             appearance: 'success',
             autoDismiss: true,
@@ -120,24 +114,14 @@ const NotificationsLunaSea = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/lunasea/test', {
-              '/api/v1/settings/notifications/lunasea/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
                 webhookUrl: values.webhookUrl,
                 profileName: values.profileName,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsPushbullet/index.tsx

@@ -5,6 +5,7 @@ import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -67,21 +68,14 @@ const NotificationsPushbullet = () => {
       validationSchema={NotificationsPushbulletSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/pushbullet', {
+          await axios.post('/api/v1/settings/notifications/pushbullet', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
               accessToken: values.accessToken,
               channelTag: values.channelTag,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           addToast(intl.formatMessage(messages.pushbulletSettingsSaved), {
             appearance: 'success',
             autoDismiss: true,
@@ -119,24 +113,14 @@ const NotificationsPushbullet = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/pushbullet/test', {
-              '/api/v1/settings/notifications/pushbullet/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
                 accessToken: values.accessToken,
                 channelTag: values.channelTag,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsPushover/index.tsx

@@ -5,6 +5,7 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
 import type { PushoverSound } from '@server/api/pushover';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -93,21 +94,14 @@ const NotificationsPushover = () => {
       validationSchema={NotificationsPushoverSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/pushover', {
+          await axios.post('/api/v1/settings/notifications/pushover', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
               accessToken: values.accessToken,
               userToken: values.userToken,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           addToast(intl.formatMessage(messages.pushoversettingssaved), {
             appearance: 'success',
             autoDismiss: true,
@@ -145,14 +139,7 @@ const NotificationsPushover = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/pushover/test', {
-              '/api/v1/settings/notifications/pushover/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
@@ -160,10 +147,8 @@ const NotificationsPushover = () => {
                 userToken: values.userToken,
                 sound: values.sound,
               },
-                }),
+            });
-              }
+
-            );
-            if (!res.ok) throw new Error();
             if (toastId) {
               removeToast(toastId);
             }

src/components/Settings/Notifications/NotificationsSlack/index.tsx

@@ -4,6 +4,7 @@ import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -64,20 +65,13 @@ const NotificationsSlack = () => {
       validationSchema={NotificationsSlackSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/slack', {
+          await axios.post('/api/v1/settings/notifications/slack', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
               webhookUrl: values.webhookUrl,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           addToast(intl.formatMessage(messages.slacksettingssaved), {
             appearance: 'success',
             autoDismiss: true,
@@ -115,23 +109,13 @@ const NotificationsSlack = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/slack/test', {
-              '/api/v1/settings/notifications/slack/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
                 webhookUrl: values.webhookUrl,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsTelegram.tsx

@@ -5,6 +5,7 @@ import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -83,12 +84,7 @@ const NotificationsTelegram = () => {
       validationSchema={NotificationsTelegramSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/telegram', {
+          await axios.post('/api/v1/settings/notifications/telegram', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
@@ -97,9 +93,7 @@ const NotificationsTelegram = () => {
               sendSilently: values.sendSilently,
               botUsername: values.botUsername,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
 
           addToast(intl.formatMessage(messages.telegramsettingssaved), {
             appearance: 'success',
@@ -138,14 +132,7 @@ const NotificationsTelegram = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/telegram/test', {
-              '/api/v1/settings/notifications/telegram/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
@@ -154,10 +141,7 @@ const NotificationsTelegram = () => {
                 sendSilently: values.sendSilently,
                 botUsername: values.botUsername,
               },
-                }),
+            });
-              }
-            );
-            if (!res.ok) throw new Error();
 
             if (toastId) {
               removeToast(toastId);

src/components/Settings/Notifications/NotificationsWebPush/index.tsx

@@ -4,6 +4,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -57,17 +58,10 @@ const NotificationsWebPush = () => {
         }}
         onSubmit={async (values) => {
           try {
-            const res = await fetch('/api/v1/settings/notifications/webpush', {
+            await axios.post('/api/v1/settings/notifications/webpush', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
               enabled: values.enabled,
               options: {},
-              }),
             });
-            if (!res.ok) throw new Error();
             mutate('/api/v1/settings/public');
             addToast(intl.formatMessage(messages.webpushsettingssaved), {
               appearance: 'success',
@@ -98,20 +92,10 @@ const NotificationsWebPush = () => {
                   toastId = id;
                 }
               );
-              const res = await fetch(
+              await axios.post('/api/v1/settings/notifications/webpush/test', {
-                '/api/v1/settings/notifications/webpush/test',
-                {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
                 enabled: true,
                 options: {},
-                  }),
+              });
-                }
-              );
-              if (!res.ok) throw new Error();
 
               if (toastId) {
                 removeToast(toastId);

src/components/Settings/Notifications/NotificationsWebhook/index.tsx

@@ -8,6 +8,7 @@ import {
   ArrowPathIcon,
   QuestionMarkCircleIcon,
 } from '@heroicons/react/24/solid';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';
@@ -149,12 +150,7 @@ const NotificationsWebhook = () => {
       validationSchema={NotificationsWebhookSchema}
       onSubmit={async (values) => {
         try {
-          const res = await fetch('/api/v1/settings/notifications/webhook', {
+          await axios.post('/api/v1/settings/notifications/webhook', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
             enabled: values.enabled,
             types: values.types,
             options: {
@@ -162,9 +158,7 @@ const NotificationsWebhook = () => {
               jsonPayload: JSON.stringify(values.jsonPayload),
               authHeader: values.authHeader,
             },
-            }),
           });
-          if (!res.ok) throw new Error();
           addToast(intl.formatMessage(messages.webhooksettingssaved), {
             appearance: 'success',
             autoDismiss: true,
@@ -213,14 +207,7 @@ const NotificationsWebhook = () => {
                 toastId = id;
               }
             );
-            const res = await fetch(
+            await axios.post('/api/v1/settings/notifications/webhook/test', {
-              '/api/v1/settings/notifications/webhook/test',
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
               enabled: true,
               types: values.types,
               options: {
@@ -228,10 +215,8 @@ const NotificationsWebhook = () => {
                 jsonPayload: JSON.stringify(values.jsonPayload),
                 authHeader: values.authHeader,
               },
-                }),
+            });
-              }
+
-            );
-            if (!res.ok) throw new Error();
             if (toastId) {
               removeToast(toastId);
             }

src/components/Settings/RadarrModal/index.tsx

@@ -4,6 +4,7 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import type { RadarrSettings } from '@server/lib/settings';
+import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -165,24 +166,19 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
     }) => {
       setIsTesting(true);
       try {
-        const res = await fetch('/api/v1/settings/radarr/test', {
+        const response = await axios.post<TestResponse>(
-          method: 'POST',
+          '/api/v1/settings/radarr/test',
-          headers: {
+          {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
             hostname,
             apiKey,
             port: Number(port),
             baseUrl,
             useSsl,
-          }),
+          }
-        });
+        );
-        if (!res.ok) throw new Error();
-        const data = await res.json();
 
         setIsValidated(true);
-        setTestResponse(data);
+        setTestResponse(response.data);
         if (initialLoad.current) {
           addToast(intl.formatMessage(messages.toastRadarrTestSuccess), {
             appearance: 'success',
@@ -275,23 +271,12 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
               tagRequests: values.tagRequests,
             };
             if (!radarr) {
-              const res = await fetch('/api/v1/settings/radarr', {
+              await axios.post('/api/v1/settings/radarr', submission);
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify(submission),
-              });
-              if (!res.ok) throw new Error();
             } else {
-              const res = await fetch(`/api/v1/settings/radarr/${radarr.id}`, {
+              await axios.put(
-                method: 'PUT',
+                `/api/v1/settings/radarr/${radarr.id}`,
-                headers: {
+                submission
-                  'Content-Type': 'application/json',
+              );
-                },
-                body: JSON.stringify(submission),
-              });
-              if (!res.ok) throw new Error();
             }
 
             onSave();

src/components/Settings/SettingsJellyfin.tsx

@@ -10,6 +10,7 @@ import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType } from '@server/constants/server';
 import type { JellyfinSettings } from '@server/lib/settings';
+import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
@@ -172,14 +173,9 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
     }
 
     try {
-      const searchParams = new URLSearchParams({
+      await axios.get('/api/v1/settings/jellyfin/library', {
-        sync: params.sync ? 'true' : 'false',
+        params,
-        ...(params.enable ? { enable: params.enable } : {}),
       });
-      const res = await fetch(
-        `/api/v1/settings/jellyfin/library?${searchParams.toString()}`
-      );
-      if (!res.ok) throw new Error(res.statusText, { cause: res });
       setIsSyncing(false);
       revalidate();
     } catch (e) {
@@ -223,32 +219,16 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
   };
 
   const startScan = async () => {
-    const res = await fetch('/api/v1/settings/jellyfin/sync', {
+    await axios.post('/api/v1/settings/jellyfin/sync', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
       start: true,
-      }),
     });
-    if (!res.ok) throw new Error();
-
     revalidateSync();
   };
 
   const cancelScan = async () => {
-    const res = await fetch('/api/v1/settings/jellyfin/sync', {
+    await axios.post('/api/v1/settings/jellyfin/sync', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
       cancel: true,
-      }),
     });
-    if (!res.ok) throw new Error();
-
     revalidateSync();
   };
 
@@ -263,19 +243,15 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
           .join(',');
       }
 
-      const searchParams = new URLSearchParams(params.enable ? params : {});
+      await axios.get('/api/v1/settings/jellyfin/library', {
-      const res = await fetch(
+        params,
-        `/api/v1/settings/jellyfin/library?${searchParams.toString()}`
+      });
-      );
+    } else {
-      if (!res.ok) throw new Error();
+      await axios.get('/api/v1/settings/jellyfin/library', {
-    } else {
+        params: {
-      const searchParams = new URLSearchParams({
+          enable: [...activeLibraries, libraryId].join(','),
-        enable: [...activeLibraries, libraryId].join(','),
+        },
       });
-      const res = await fetch(
-        `/api/v1/settings/jellyfin/library?${searchParams.toString()}`
-      );
-      if (!res.ok) throw new Error();
     }
     if (onComplete) {
       onComplete();
@@ -485,12 +461,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
         validationSchema={JellyfinSettingsSchema}
         onSubmit={async (values) => {
           try {
-            const res = await fetch('/api/v1/settings/jellyfin', {
+            await axios.post('/api/v1/settings/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
               ip: values.hostname,
               port: Number(values.port),
               useSsl: values.useSsl,
@@ -498,9 +469,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
               externalHostname: values.jellyfinExternalUrl,
               jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
               apiKey: values.apiKey,
-              } as JellyfinSettings),
+            } as JellyfinSettings);
-            });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
 
             addToast(
               intl.formatMessage(

src/components/Settings/SettingsJobsCache/index.tsx

@@ -20,6 +20,7 @@ import type {
   CacheResponse,
 } from '@server/interfaces/api/settingsInterfaces';
 import type { JobId } from '@server/lib/settings';
+import axios from 'axios';
 import cronstrue from 'cronstrue/i18n';
 import { Fragment, useReducer, useState } from 'react';
 import type { MessageDescriptor } from 'react-intl';
@@ -188,10 +189,7 @@ const SettingsJobs = () => {
   }
 
   const runJob = async (job: Job) => {
-    const res = await fetch(`/api/v1/settings/jobs/${job.id}/run`, {
+    await axios.post(`/api/v1/settings/jobs/${job.id}/run`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
     addToast(
       intl.formatMessage(messages.jobstarted, {
         jobname: intl.formatMessage(messages[job.id] ?? messages.unknownJob),
@@ -205,10 +203,7 @@ const SettingsJobs = () => {
   };
 
   const cancelJob = async (job: Job) => {
-    const res = await fetch(`/api/v1/settings/jobs/${job.id}/cancel`, {
+    await axios.post(`/api/v1/settings/jobs/${job.id}/cancel`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
     addToast(
       intl.formatMessage(messages.jobcancelled, {
         jobname: intl.formatMessage(messages[job.id] ?? messages.unknownJob),
@@ -222,10 +217,7 @@ const SettingsJobs = () => {
   };
 
   const flushCache = async (cache: CacheItem) => {
-    const res = await fetch(`/api/v1/settings/cache/${cache.id}/flush`, {
+    await axios.post(`/api/v1/settings/cache/${cache.id}/flush`);
-      method: 'POST',
-    });
-    if (!res.ok) throw new Error();
     addToast(
       intl.formatMessage(messages.cacheflushed, { cachename: cache.name }),
       {
@@ -252,19 +244,12 @@ const SettingsJobs = () => {
       }
 
       setIsSaving(true);
-      const res = await fetch(
+      await axios.post(
         `/api/v1/settings/jobs/${jobModalState.job.id}/schedule`,
         {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
           schedule: jobScheduleCron.join(' '),
-          }),
         }
       );
-      if (!res.ok) throw new Error();
 
       addToast(intl.formatMessage(messages.jobScheduleEditSaved), {
         appearance: 'success',