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

package.json

@@ -43,6 +43,7 @@
     "@svgr/webpack": "6.5.1",
     "@tanem/react-nprogress": "5.0.30",
     "ace-builds": "1.15.2",
+    "axios": "^1.7.7",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
     "connect-typeorm": "1.1.4",

pnpm-lock.yaml

@@ -41,6 +41,9 @@ importers:
       ace-builds:
         specifier: 1.15.2
         version: 1.15.2
+      axios:
+        specifier: ^1.7.7
+        version: 1.7.7
       bcrypt:
         specifier: 5.1.0
         version: 5.1.0(encoding@0.1.13)
@@ -3402,6 +3405,9 @@ packages:
     resolution: {integrity: sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==}
     engines: {node: '>=4'}
 
+  axios@1.7.7:
+    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
+
   axobject-query@3.1.1:
     resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==}
 
@@ -5022,6 +5028,15 @@ packages:
   fn.name@1.1.0:
     resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}
 
+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
   for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
 
@@ -5036,6 +5051,10 @@ packages:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
 
+  form-data@4.0.1:
+    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
+    engines: {node: '>= 6'}
+
   formik@2.4.6:
     resolution: {integrity: sha512-A+2EI7U7aG296q2TLGvNapDNTZp1khVt5Vk0Q/fyfSROss0V/V6+txt2aJnwEos44IxTCW/LYAi/zgWzlevj+g==}
     peerDependencies:
@@ -7384,6 +7403,9 @@ packages:
   proxy-from-env@1.0.0:
     resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
 
+  proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+
   psl@1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
 
@@ -13263,6 +13285,14 @@ snapshots:
 
   axe-core@4.9.1: {}
 
+  axios@1.7.7:
+    dependencies:
+      follow-redirects: 1.15.9
+      form-data: 4.0.1
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   axobject-query@3.1.1:
     dependencies:
       deep-equal: 2.2.3
@@ -15278,6 +15308,8 @@ snapshots:
 
   fn.name@1.1.0: {}
 
+  follow-redirects@1.15.9: {}
+
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
@@ -15295,6 +15327,12 @@ snapshots:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
+  form-data@4.0.1:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+
   formik@2.4.6(react@18.3.1):
     dependencies:
       '@types/hoist-non-react-statics': 3.3.5
@@ -17842,6 +17880,8 @@ snapshots:
 
   proxy-from-env@1.0.0: {}
 
+  proxy-from-env@1.1.0: {}
+
   psl@1.9.0: {}
 
   pstree.remy@1.1.8: {}

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,101 +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: {
-    }
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+        ...options.headers,
+      },
+    });
 
-    const url = new URL(baseUrl);
+    // if (options.rateLimit) {
-
+    //   this.axios = rateLimit(this.axios, {
-    this.defaultHeaders = {
+    //     maxRequests: options.rateLimit.maxRequests,
-      'Content-Type': 'application/json',
+    //     maxRPS: options.rateLimit.maxRPS,
-      Accept: 'application/json',
+    //   });
-      ...((url.username || url.password) && {
+    // }
-        Authorization: `Basic ${Buffer.from(
-          `${url.username}:${url.password}`
-        ).toString('base64')}`,
-      }),
-      ...options.headers,
-    };
-
-    if (url.username || url.password) {
-      url.username = '';
-      url.password = '';
-      baseUrl = url.toString();
-    }
 
     this.baseUrl = baseUrl;
-    this.params = params;
     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);
@@ -113,43 +84,23 @@ 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>,
+    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);
@@ -157,73 +108,41 @@ class ExternalAPI {
       return cachedItem;
     }
 
-    const url = this.formatUrl(endpoint, params);
+    const response = await this.axios.put<T>(endpoint, data, config);
-    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) {
+    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 delete<T>(
     endpoint: string,
-    params?: Record<string, string>,
+    config?: AxiosRequestConfig,
-    config?: RequestInit
+    ttl?: number
   ): Promise<T> {
-    const url = this.formatUrl(endpoint, params);
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
-    const response = await this.fetch(url, {
+    const cachedItem = this.cache?.get<T>(cacheKey);
-      method: 'DELETE',
+    if (cachedItem) {
-      ...config,
+      return cachedItem;
-      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;
+    const response = await this.axios.delete<T>(endpoint, config);
+
+    if (this.cache) {
+      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+    }
+
+    return response.data;
   }
 
   protected async getRolling<T>(
     endpoint: string,
-    params?: Record<string, string>,
+    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) {
@@ -234,78 +153,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(
@@ -318,29 +179,6 @@ class ExternalAPI {
 
     return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
   }
-
-  private async getDataFromResponse(response: Response) {
-    const contentType = response.headers.get('Content-Type');
-    if (contentType?.includes('application/json')) {
-      return await response.json();
-    } else if (
-      contentType?.includes('application/xml') ||
-      contentType?.includes('text/html') ||
-      contentType?.includes('text/plain')
-    ) {
-      return await response.text();
-    } else {
-      try {
-        return await response.json();
-      } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
-      }
-    }
-  }
 }
 
 export default ExternalAPI;

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

server/api/jellyfin.ts

@@ -129,8 +129,6 @@ class JellyfinAPI extends ExternalAPI {
           Username,
           Pw: Password,
         },
-        {},
-        undefined,
         { headers }
       );
     };
@@ -293,13 +291,15 @@ class JellyfinAPI extends ExternalAPI {
       const libraryItemsResponse = await this.get<any>(
         `/Users/${this.userId}/Items`,
         {
-          SortBy: 'SortName',
+          params: {
-          SortOrder: 'Ascending',
+            SortBy: 'SortName',
-          IncludeItemTypes: 'Series,Movie,Others',
+            SortOrder: 'Ascending',
-          Recursive: 'true',
+            IncludeItemTypes: 'Series,Movie,Others',
-          StartIndex: '0',
+            Recursive: 'true',
-          ParentId: id,
+            StartIndex: '0',
-          collapseBoxSetItems: 'false',
+            ParentId: id,
+            collapseBoxSetItems: 'false',
+          },
         }
       );
 
@@ -321,8 +321,10 @@ class JellyfinAPI extends ExternalAPI {
       const itemResponse = await this.get<any>(
         `/Users/${this.userId}/Items/Latest`,
         {
-          Limit: '12',
+          params: {
-          ParentId: id,
+            Limit: '12',
+            ParentId: id,
+          },
         }
       );
 
@@ -384,7 +386,9 @@ class JellyfinAPI extends ExternalAPI {
       const episodeResponse = await this.get<any>(
         `/Shows/${seriesID}/Episodes`,
         {
-          seasonId: seasonID,
+          params: {
+            seasonId: seasonID,
+          },
         }
       );
 

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,49 +270,49 @@ 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(
-          const detailedResponse = await this.getRolling<MetadataResponse>(
+          async (watchlistItem) => {
-            `/library/metadata/${watchlistItem.ratingKey}`,
+            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];
+            const metadata = detailedResponse.MediaContainer.Metadata[0];
 
-          const tmdbString = metadata.Guid.find((guid) =>
+            const tmdbString = metadata.Guid.find((guid) =>
-            guid.id.startsWith('tmdb')
+              guid.id.startsWith('tmdb')
-          );
+            );
-          const tvdbString = metadata.Guid.find((guid) =>
+            const tvdbString = metadata.Guid.find((guid) =>
-            guid.id.startsWith('tvdb')
+              guid.id.startsWith('tvdb')
-          );
+            );
 
-          return {
+            return {
-            ratingKey: metadata.ratingKey,
+              ratingKey: metadata.ratingKey,
-            // This should always be set? But I guess it also cannot be?
+              // This should always be set? But I guess it also cannot be?
-            // We will filter out the 0's afterwards
+              // We will filter out the 0's afterwards
-            tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
+              tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
-            tvdbId: tvdbString
+              tvdbId: tvdbString
-              ? Number(tvdbString.id.split('//')[1])
+                ? Number(tvdbString.id.split('//')[1])
-              : undefined,
+                : undefined,
-            title: metadata.title,
+              title: metadata.title,
-            type: metadata.type,
+              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', {
-        token: appToken,
+        params: {
+          token: appToken,
+        },
       });
 
       return mapSounds(data.sounds);

server/api/servarr/base.ts

@@ -160,7 +160,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
       const data = await this.get<QueueResponse<QueueItemAppendT>>(
         `/queue`,
         {
-          includeEpisode: 'true',
+          params: {
+            includeEpisode: 'true',
+          },
         },
         0
       );

server/api/servarr/radarr.ts

@@ -58,7 +58,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
   public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
     try {
       const data = await this.get<RadarrMovie[]>('/movie/lookup', {
-        term: `tmdb:${id}`,
+        params: {
+          term: `tmdb:${id}`,
+        },
       });
 
       if (!data[0]) {
@@ -222,8 +224,10 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
     try {
       const { id, title } = await this.getMovieByTmdbId(movieId);
       await this.delete(`/movie/${id}`, {
-        deleteFiles: 'true',
+        params: {
-        addImportExclusion: 'false',
+          deleteFiles: 'true',
+          addImportExclusion: 'false',
+        },
       });
       logger.info(`[Radarr] Removed movie ${title}`);
     } catch (e) {

server/api/servarr/sonarr.ts

@@ -138,7 +138,9 @@ class SonarrAPI extends ServarrBase<{
   public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
     try {
       const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: title,
+        params: {
+          term: title,
+        },
       });
 
       if (!data[0]) {
@@ -159,7 +161,9 @@ class SonarrAPI extends ServarrBase<{
   public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
     try {
       const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: `tvdb:${id}`,
+        params: {
+          term: `tvdb:${id}`,
+        },
       });
 
       if (!data[0]) {
@@ -345,8 +349,10 @@ class SonarrAPI extends ServarrBase<{
     try {
       const { id, title } = await this.getSeriesByTvdbId(serieId);
       await this.delete(`/series/${id}`, {
-        deleteFiles: 'true',
+        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', {
-          cmd: 'get_item_watch_time_stats',
+          params: {
-          rating_key: ratingKey,
+            cmd: 'get_item_watch_time_stats',
-          grouping: '1',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
         })
-      ).response.data;
+      ).data.response.data;
     } catch (e) {
       logger.error(
         'Something went wrong fetching media watch stats from Tautulli',
@@ -173,12 +176,14 @@ class TautulliAPI extends ExternalAPI {
   ): Promise<TautulliWatchUser[]> {
     try {
       return (
-        await this.get<TautulliWatchUsersResponse>('/api/v2', {
+        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
-          cmd: 'get_item_user_stats',
+          params: {
-          rating_key: ratingKey,
+            cmd: 'get_item_user_stats',
-          grouping: '1',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
         })
-      ).response.data;
+      ).data.response.data;
     } catch (e) {
       logger.error(
         'Something went wrong fetching media watch users from Tautulli',
@@ -201,13 +206,15 @@ class TautulliAPI extends ExternalAPI {
       }
 
       return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_user_watch_time_stats',
+          params: {
-          user_id: user.plexId.toString(),
+            cmd: 'get_user_watch_time_stats',
-          query_days: '0',
+            user_id: user.plexId,
-          grouping: '1',
+            query_days: 0,
+            grouping: 1,
+          },
         })
-      ).response.data[0];
+      ).data.response.data[0];
     } catch (e) {
       logger.error(
         'Something went wrong fetching user watch stats from Tautulli',
@@ -238,17 +245,19 @@ class TautulliAPI extends ExternalAPI {
 
       while (results.length < 20) {
         const tautulliData = (
-          await this.get<TautulliHistoryResponse>('/api/v2', {
+          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
-            cmd: 'get_history',
+            params: {
-            grouping: '1',
+              cmd: 'get_history',
-            order_column: 'date',
+              grouping: 1,
-            order_dir: 'desc',
+              order_column: 'date',
-            user_id: user.plexId.toString(),
+              order_dir: 'desc',
-            media_type: 'movie,episode',
+              user_id: user.plexId,
-            length: take.toString(),
+              media_type: 'movie,episode',
-            start: start.toString(),
+              length: take,
+              start,
+            },
           })
-        ).response.data.data;
+        ).data.response.data.data;
 
         if (!tautulliData.length) {
           return results;

server/api/themoviedb/index.ts

@@ -112,10 +112,10 @@ class TheMovieDb extends ExternalAPI {
       },
       {
         nodeCache: cacheManager.getCache('tmdb').data,
-        rateLimit: {
+        // rateLimit: {
-          maxRPS: 50,
+        //   maxRPS: 50,
-          id: 'tmdb',
+        //   id: 'tmdb',
-        },
+        // },
       }
     );
     this.region = region;
@@ -130,10 +130,12 @@ class TheMovieDb extends ExternalAPI {
   }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
     try {
       const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        query,
+        params: {
-        page: page.toString(),
+          query,
-        include_adult: includeAdult ? 'true' : 'false',
+          page: page.toString(),
-        language,
+          include_adult: includeAdult ? 'true' : 'false',
+          language,
+        },
       });
 
       return data;
@@ -156,11 +158,13 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
     try {
       const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
-        query,
+        params: {
-        page: page.toString(),
+          query,
-        include_adult: includeAdult ? 'true' : 'false',
+          page: page.toString(),
-        language,
+          include_adult: includeAdult ? 'true' : 'false',
-        primary_release_year: year?.toString() || '',
+          language,
+          primary_release_year: year?.toString() || '',
+        },
       });
 
       return data;
@@ -183,11 +187,13 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
     try {
       const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
-        query,
+        params: {
-        page: page.toString(),
+          query,
-        include_adult: includeAdult ? 'true' : 'false',
+          page: page.toString(),
-        language,
+          include_adult: includeAdult ? 'true' : 'false',
-        first_air_date_year: year?.toString() || '',
+          language,
+          first_air_date_year: year?.toString() || '',
+        },
       });
 
       return data;
@@ -210,7 +216,9 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbPersonDetails> => {
     try {
       const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        language,
+        params: {
+          language,
+        },
       });
 
       return data;
@@ -230,7 +238,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbPersonCombinedCredits>(
         `/person/${personId}/combined_credits`,
         {
-          language,
+          params: {
+            language,
+          },
         }
       );
 
@@ -253,9 +263,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbMovieDetails>(
         `/movie/${movieId}`,
         {
-          language,
+          params: {
-          append_to_response:
+            language,
-            'credits,external_ids,videos,keywords,release_dates,watch/providers',
+            append_to_response:
+              'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          },
         },
         43200
       );
@@ -277,9 +289,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbTvDetails>(
         `/tv/${tvId}`,
         {
-          language,
+          params: {
-          append_to_response:
+            language,
-            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+            append_to_response:
+              'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          },
         },
         43200
       );
@@ -303,8 +317,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSeasonWithEpisodes>(
         `/tv/${tvId}/season/${seasonNumber}`,
         {
-          language: language || '',
+          params: {
-          append_to_response: 'external_ids',
+            language: language || '',
+            append_to_response: 'external_ids',
+          },
         }
       );
 
@@ -327,8 +343,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/recommendations`,
         {
-          page: page.toString(),
+          params: {
-          language,
+            page: page.toString(),
+            language,
+          },
         }
       );
 
@@ -351,8 +369,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/similar`,
         {
-          page: page.toString(),
+          params: {
-          language,
+            page: page.toString(),
+            language,
+          },
         }
       );
 
@@ -375,8 +395,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/keyword/${keywordId}/movies`,
         {
-          page: page.toString(),
+          params: {
-          language,
+            page: page.toString(),
+            language,
+          },
         }
       );
 
@@ -399,8 +421,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/tv/${tvId}/recommendations`,
         {
-          page: page.toString(),
+          params: {
-          language,
+            page: page.toString(),
+            language,
+          },
         }
       );
 
@@ -423,8 +447,10 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbSearchTvResponse> {
     try {
       const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        page: page.toString(),
+        params: {
-        language,
+          page: page.toString(),
+          language,
+        },
       });
 
       return data;
@@ -465,38 +491,40 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
-        sort_by: sortBy,
+        params: {
-        page: page.toString(),
+          sort_by: sortBy,
-        include_adult: includeAdult ? 'true' : 'false',
+          page: page.toString(),
-        language,
+          include_adult: includeAdult ? 'true' : 'false',
-        region: this.region || '',
+          language,
-        with_original_language:
+          region: this.region || '',
-          originalLanguage && originalLanguage !== 'all'
+          with_original_language:
-            ? originalLanguage
+            originalLanguage && originalLanguage !== 'all'
-            : originalLanguage === 'all'
+              ? originalLanguage
-            ? ''
+              : originalLanguage === 'all'
-            : this.originalLanguage || '',
+              ? ''
-        // Set our release date values, but check if one is set and not the other,
+              : this.originalLanguage || '',
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          // Set our release date values, but check if one is set and not the other,
-        'primary_release_date.gte':
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
-          !primaryReleaseDateGte && primaryReleaseDateLte
+          'primary_release_date.gte':
-            ? defaultPastDate
+            !primaryReleaseDateGte && primaryReleaseDateLte
-            : primaryReleaseDateGte || '',
+              ? defaultPastDate
-        'primary_release_date.lte':
+              : primaryReleaseDateGte || '',
-          !primaryReleaseDateLte && primaryReleaseDateGte
+          'primary_release_date.lte':
-            ? defaultFutureDate
+            !primaryReleaseDateLte && primaryReleaseDateGte
-            : primaryReleaseDateLte || '',
+              ? defaultFutureDate
-        with_genres: genre || '',
+              : primaryReleaseDateLte || '',
-        with_companies: studio || '',
+          with_genres: genre || '',
-        with_keywords: keywords || '',
+          with_companies: studio || '',
-        'with_runtime.gte': withRuntimeGte || '',
+          with_keywords: keywords || '',
-        'with_runtime.lte': withRuntimeLte || '',
+          'with_runtime.gte': withRuntimeGte || '',
-        'vote_average.gte': voteAverageGte || '',
+          'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.lte': voteAverageLte || '',
+          'vote_average.gte': voteAverageGte || '',
-        'vote_count.gte': voteCountGte || '',
+          'vote_average.lte': voteAverageLte || '',
-        'vote_count.lte': voteCountLte || '',
+          'vote_count.gte': voteCountGte || '',
-        watch_region: watchRegion || '',
+          'vote_count.lte': voteCountLte || '',
-        with_watch_providers: watchProviders || '',
+          watch_region: watchRegion || '',
+          with_watch_providers: watchProviders || '',
+        },
       });
 
       return data;
@@ -538,41 +566,43 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
-        sort_by: sortBy,
+        params: {
-        page: page.toString(),
+          sort_by: sortBy,
-        language,
+          page: page.toString(),
-        region: this.region || '',
+          language,
-        // Set our release date values, but check if one is set and not the other,
+          region: this.region || '',
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          // Set our release date values, but check if one is set and not the other,
-        'first_air_date.gte':
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
-          !firstAirDateGte && firstAirDateLte
+          'first_air_date.gte':
-            ? defaultPastDate
+            !firstAirDateGte && firstAirDateLte
-            : firstAirDateGte || '',
+              ? defaultPastDate
-        'first_air_date.lte':
+              : firstAirDateGte || '',
-          !firstAirDateLte && firstAirDateGte
+          'first_air_date.lte':
-            ? defaultFutureDate
+            !firstAirDateLte && firstAirDateGte
-            : firstAirDateLte || '',
+              ? defaultFutureDate
-        with_original_language:
+              : firstAirDateLte || '',
-          originalLanguage && originalLanguage !== 'all'
+          with_original_language:
-            ? originalLanguage
+            originalLanguage && originalLanguage !== 'all'
-            : originalLanguage === 'all'
+              ? originalLanguage
-            ? ''
+              : originalLanguage === 'all'
-            : this.originalLanguage || '',
+              ? ''
-        include_null_first_air_dates: includeEmptyReleaseDate
+              : this.originalLanguage || '',
-          ? 'true'
+          include_null_first_air_dates: includeEmptyReleaseDate
-          : 'false',
+            ? 'true'
-        with_genres: genre || '',
+            : 'false',
-        with_networks: network?.toString() || '',
+          with_genres: genre || '',
-        with_keywords: keywords || '',
+          with_networks: network?.toString() || '',
-        'with_runtime.gte': withRuntimeGte || '',
+          with_keywords: keywords || '',
-        'with_runtime.lte': withRuntimeLte || '',
+          'with_runtime.gte': withRuntimeGte || '',
-        'vote_average.gte': voteAverageGte || '',
+          'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.lte': voteAverageLte || '',
+          'vote_average.gte': voteAverageGte || '',
-        'vote_count.gte': voteCountGte || '',
+          'vote_average.lte': voteAverageLte || '',
-        'vote_count.lte': voteCountLte || '',
+          'vote_count.gte': voteCountGte || '',
-        with_watch_providers: watchProviders || '',
+          'vote_count.lte': voteCountLte || '',
-        watch_region: watchRegion || '',
+          with_watch_providers: watchProviders || '',
-        with_status: withStatus || '',
+          watch_region: watchRegion || '',
+          with_status: withStatus || '',
+        },
       });
 
       return data;
@@ -592,10 +622,12 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbUpcomingMoviesResponse>(
         '/movie/upcoming',
         {
-          page: page.toString(),
+          params: {
-          language,
+            page: page.toString(),
-          region: this.region || '',
+            language,
-          originalLanguage: this.originalLanguage || '',
+            region: this.region || '',
+            originalLanguage: this.originalLanguage || '',
+          },
         }
       );
 
@@ -618,9 +650,11 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMultiResponse>(
         `/trending/all/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
-          language,
+            page: page.toString(),
-          region: this.region || '',
+            language,
+            region: this.region || '',
+          },
         }
       );
 
@@ -641,7 +675,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/trending/movie/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page: page.toString(),
+          },
         }
       );
 
@@ -662,7 +698,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/trending/tv/${timeWindow}`,
         {
-          page: page.toString(),
+          params: {
+            page: page.toString(),
+          },
         }
       );
 
@@ -691,8 +729,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbExternalIdResponse>(
         `/find/${externalId}`,
         {
-          external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+          params: {
-          language,
+            external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+            language,
+          },
         }
       );
 
@@ -782,7 +822,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCollection>(
         `/collection/${collectionId}`,
         {
-          language,
+          params: {
+            language,
+          },
         }
       );
 
@@ -855,7 +897,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/movie/list',
         {
-          language,
+          params: {
+            language,
+          },
         },
         86400 // 24 hours
       );
@@ -867,7 +911,9 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/movie/list',
           {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
           },
           86400 // 24 hours
         );
@@ -902,7 +948,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/tv/list',
         {
-          language,
+          params: {
+            language,
+          },
         },
         86400 // 24 hours
       );
@@ -914,7 +962,9 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/tv/list',
           {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
           },
           86400 // 24 hours
         );
@@ -969,8 +1019,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbKeywordSearchResponse>(
         '/search/keyword',
         {
-          query,
+          params: {
-          page: page.toString(),
+            query,
+            page: page.toString(),
+          },
         },
         86400 // 24 hours
       );
@@ -992,8 +1044,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCompanySearchResponse>(
         '/search/company',
         {
-          query,
+          params: {
-          page: page.toString(),
+            query,
+            page: page.toString(),
+          },
         },
         86400 // 24 hours
       );
@@ -1013,7 +1067,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
         '/watch/providers/regions',
         {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
+            language: language ? this.originalLanguage || '' : '',
+          },
         },
         86400 // 24 hours
       );
@@ -1037,8 +1093,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/movie',
         {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
-          watch_region: watchRegion,
+            language: language ? this.originalLanguage || '' : '',
+            watch_region: watchRegion,
+          },
         },
         86400 // 24 hours
       );
@@ -1062,8 +1120,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/tv',
         {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
-          watch_region: watchRegion,
+            language: language ? this.originalLanguage || '' : '',
+            watch_region: watchRegion,
+          },
         },
         86400 // 24 hours
       );