From c76365e09891098b630c85c1f0b1966a39233c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Fearn?= <26871415+flavioislima@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:41:12 +0000 Subject: [PATCH] [TECH] Upgrade Axios to latest (#3917) * [TECH] Upgrade Axios to latest * fix: types and imports * tech: axios to v1.7.7 * fir: types * fix: lint --------- Co-authored-by: Flavio F Lima --- package.json | 2 +- pnpm-lock.yaml | 29 ++++++++++++------- src/backend/online_monitor.ts | 4 --- src/backend/storeManagers/gog/library.ts | 8 ++--- src/backend/wiki_game_info/protondb/utils.ts | 2 +- src/backend/wiki_game_info/steamdeck/utils.ts | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index f11777571c..420cb15a01 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@mui/material": "5.11.12", "@node-steam/vdf": "2.2.0", "@shockpkg/icon-encoder": "2.1.3", - "axios": "0.26.1", + "axios": "1.7.7", "classnames": "2.3.1", "compare-versions": "6.1.0", "crc": "4.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2f17b65be..d28dec3279 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,8 +56,8 @@ importers: specifier: 2.1.3 version: 2.1.3 axios: - specifier: 0.26.1 - version: 0.26.1 + specifier: 1.7.7 + version: 1.7.7 classnames: specifier: 2.3.1 version: 2.3.1 @@ -250,7 +250,7 @@ importers: version: 31.3.1 electron-builder: specifier: 24.13.3 - version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + version: 24.13.3(electron-builder-squirrel-windows@24.13.3) electron-vite: specifier: ^2.0.0 version: 2.2.0(@swc/core@1.4.11)(vite@5.2.8(@types/node@20.14.14(patch_hash=fnw5qjd7ourh3kgztkygdc5gdm))(sass@1.59.2)) @@ -2104,8 +2104,8 @@ packages: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} - axios@0.26.1: - resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} + axios@1.7.7: + resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==} babel-jest@29.7.0: resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==} @@ -4661,6 +4661,9 @@ packages: property-information@6.4.1: resolution: {integrity: sha512-OHYtXfu5aI2sS2LWFSN5rgJjrQ4pCy8i1jubJLe2QvMF8JJ++HXTUIVWFLfXJoaOfvYYjk2SN8J2wFUWIGXT4w==} + proxy-from-env@1.1.0: + resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} + pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -7572,7 +7575,7 @@ snapshots: app-builder-bin@4.0.0: {} - app-builder-lib@24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)): + app-builder-lib@24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.2.1 @@ -7736,9 +7739,11 @@ snapshots: dependencies: possible-typed-array-names: 1.0.0 - axios@0.26.1: + axios@1.7.7: dependencies: follow-redirects: 1.15.6 + form-data: 4.0.0 + proxy-from-env: 1.1.0 transitivePeerDependencies: - debug @@ -8441,7 +8446,7 @@ snapshots: dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) builder-util: 24.13.1 builder-util-runtime: 9.2.4 fs-extra: 10.1.0 @@ -8538,7 +8543,7 @@ snapshots: electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) archiver: 5.3.2 builder-util: 24.13.1 fs-extra: 10.1.0 @@ -8546,9 +8551,9 @@ snapshots: - dmg-builder - supports-color - electron-builder@24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)): + electron-builder@24.13.3(electron-builder-squirrel-windows@24.13.3): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) builder-util: 24.13.1 builder-util-runtime: 9.2.4 chalk: 4.1.2 @@ -10945,6 +10950,8 @@ snapshots: property-information@6.4.1: {} + proxy-from-env@1.1.0: {} + pseudomap@1.0.2: {} pump@2.0.1: diff --git a/src/backend/online_monitor.ts b/src/backend/online_monitor.ts index 91bea642ea..0756941e15 100644 --- a/src/backend/online_monitor.ts +++ b/src/backend/online_monitor.ts @@ -5,10 +5,6 @@ import axios from 'axios' import EventEmitter from 'node:events' import { sendFrontendMessage } from './main_window' -//**********FORCE TO USE http adapter (node.js version):***** -axios.defaults.adapter = require('axios/lib/adapters/http.js') -//**********FORCE TO USE http adapter (node.js version):***** - let status: ConnectivityStatus let abortController: AbortController let retryTimer: NodeJS.Timeout diff --git a/src/backend/storeManagers/gog/library.ts b/src/backend/storeManagers/gog/library.ts index 2fa35f3e8a..37342be8cc 100644 --- a/src/backend/storeManagers/gog/library.ts +++ b/src/backend/storeManagers/gog/library.ts @@ -1,5 +1,5 @@ import { sendFrontendMessage } from '../../main_window' -import axios, { AxiosError, AxiosRequestHeaders, AxiosResponse } from 'axios' +import axios, { AxiosError, AxiosResponse } from 'axios' import { GOGUser } from './user' import { GameInfo, @@ -854,7 +854,7 @@ export async function getBuilds( url.searchParams.set('password', password) } - const headers: AxiosRequestHeaders = {} + const headers: Record = {} if (access_token) { headers.Authorization = `Bearer ${access_token}` } @@ -1206,7 +1206,7 @@ export async function getGamesdbData( logError( [ `Was not able to get GamesDB data for ${game_id}`, - error.response?.data.error_description + error.response?.data ], LogPrefix.ExtraGameInfo ) @@ -1250,7 +1250,7 @@ export async function getProductApi( url.searchParams.set('expand', expand.join(',')) } - const headers: AxiosRequestHeaders = {} + const headers: Record = {} if (accessToken) { headers.Authorization = `Bearer ${accessToken}` } diff --git a/src/backend/wiki_game_info/protondb/utils.ts b/src/backend/wiki_game_info/protondb/utils.ts index 883787ad03..0f4c20b898 100644 --- a/src/backend/wiki_game_info/protondb/utils.ts +++ b/src/backend/wiki_game_info/protondb/utils.ts @@ -19,7 +19,7 @@ export async function getInfoFromProtonDB( logError( [ `Was not able to get ProtonDB data for ${steamID}`, - error.response?.data.error_description + error.response?.data ], LogPrefix.ExtraGameInfo ) diff --git a/src/backend/wiki_game_info/steamdeck/utils.ts b/src/backend/wiki_game_info/steamdeck/utils.ts index 4a4626a073..90d0b60763 100644 --- a/src/backend/wiki_game_info/steamdeck/utils.ts +++ b/src/backend/wiki_game_info/steamdeck/utils.ts @@ -18,7 +18,7 @@ export async function getSteamDeckComp( logError( [ `Was not able to get Stem Deck data for ${steamID}`, - error.response?.data.error_description + error.response?.data ], LogPrefix.ExtraGameInfo )