refactor: switch from Fetch API to Axios (#1520)

* refactor: switch from Fetch API to Axios * fix: remove unwanted changes * fix: rewrite error handling for Axios and remove IPv4 first setting * style: run prettier * style: run prettier * fix: add back custom proxy agent * fix: add back custom proxy agent * fix: correct rebase issue * fix: resolve review comments
2025-04-08 13:20:10 +02:00
parent 21400cecdc
commit a488f850f3
112 changed files with 1654 additions and 3032 deletions
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/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', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              mediaId: part.id,
-              mediaType: 'movie',
-              is4k,
-              ...overrideParams,
-            }),
+          await axios.post<MediaRequest>('/api/v1/request', {
+            mediaId: part.id,
+            mediaType: 'movie',
+            is4k,
+            ...overrideParams,
          });
-          if (!res.ok) throw new Error();
        })
      );

--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/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,24 +90,16 @@ const MovieRequestModal = ({
          tags: requestOverrides.tags,
        };
      }
-      const res = await fetch('/api/v1/request', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          mediaId: data?.id,
-          mediaType: 'movie',
-          is4k,
-          ...overrideParams,
-        }),
+      const response = await axios.post<MediaRequest>('/api/v1/request', {
+        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');
      mutate('/api/v1/request/count');

-      if (mediaRequest) {
+      if (response.data) {
        if (onComplete) {
          onComplete(
            hasPermission(
@@ -154,15 +147,13 @@ const MovieRequestModal = ({
    setIsUpdating(true);

    try {
-      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
-
+      const response = await axios.delete<MediaRequest>(
+        `/api/v1/request/${editRequest?.id}`
+      );
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');

-      if (res.status === 204) {
+      if (response.status === 204) {
        if (onComplete) {
          onComplete(MediaStatus.UNKNOWN);
        }
@@ -185,27 +176,17 @@ const MovieRequestModal = ({
    setIsUpdating(true);

    try {
-      const res = await fetch(`/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,
-        }),
+      await axios.put(`/api/v1/request/${editRequest?.id}`, {
+        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`, {
-          method: 'POST',
-        });
-        if (!res.ok) throw new Error();
+        await axios.post(`/api/v1/request/${editRequest?.id}/approve`);
      }
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/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,35 +112,22 @@ const TvRequestModal = ({

    try {
      if (selectedSeasons.length > 0) {
-        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
-          method: 'PUT',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            mediaType: 'tv',
-            serverId: requestOverrides?.server,
-            profileId: requestOverrides?.profile,
-            rootFolder: requestOverrides?.folder,
-            languageProfileId: requestOverrides?.language,
-            userId: requestOverrides?.user?.id,
-            tags: requestOverrides?.tags,
-            seasons: selectedSeasons,
-          }),
+        await axios.put(`/api/v1/request/${editRequest.id}`, {
+          mediaType: 'tv',
+          serverId: requestOverrides?.server,
+          profileId: requestOverrides?.profile,
+          rootFolder: requestOverrides?.folder,
+          languageProfileId: requestOverrides?.language,
+          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`, {
-            method: 'POST',
-          });
-          if (!res.ok) throw new Error();
+          await axios.post(`/api/v1/request/${editRequest.id}/approve`);
        }
      } else {
-        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
-          method: 'DELETE',
-        });
-        if (!res.ok) throw new Error();
+        await axios.delete(`/api/v1/request/${editRequest.id}`);
      }
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');
@@ -206,32 +194,23 @@ const TvRequestModal = ({
          tags: requestOverrides.tags,
        };
      }
-      const res = await fetch('/api/v1/request', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          mediaId: data?.id,
-          tvdbId: tvdbId ?? data?.externalIds.tvdbId,
-          mediaType: 'tv',
-          is4k,
-          seasons: settings.currentSettings.partialRequestsEnabled
-            ? selectedSeasons.sort((a, b) => a - b)
-            : getAllSeasons().filter(
-                (season) => !getAllRequestedSeasons().includes(season)
-              ),
-          ...overrideParams,
-        }),
+      const response = await axios.post<MediaRequest>('/api/v1/request', {
+        mediaId: data?.id,
+        tvdbId: tvdbId ?? data?.externalIds.tvdbId,
+        mediaType: 'tv',
+        is4k,
+        seasons: settings.currentSettings.partialRequestsEnabled
+          ? selectedSeasons.sort((a, b) => a - b)
+          : getAllSeasons().filter(
+              (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>