refactor(http): removed axios; changed all requests to native fetch

package.json

@@ -31,7 +31,6 @@
     "@vite-pwa/assets-generator": "^1.0.0",
     "@vitejs/plugin-vue": "^6.0.1",
     "@vue/tsconfig": "^0.8.1",
-    "axios": "^1.9.0",
     "prettier": "^3.3.3",
     "typescript": "^5.5.4",
     "vite": "^7.1.4",

src/App.vue

@@ -30,7 +30,6 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import axios from 'axios';
 
 import { version } from '../package.json';
 import { Status } from './typings/common';
@@ -114,11 +113,15 @@ export default defineComponent({
       }
 
       try {
-        const releaseData = await (
+        const response = await fetch(
-          await axios.get('https://api.github.com/repos/Spythere/stacjownik/releases/latest')
+          'https://api.github.com/repos/Spythere/stacjownik/releases/latest'
-        ).data;
+        );
 
-        if (!releaseData) return;
+        if (!response.ok) {
+          throw new Error('Failed to fetch release data from repository!');
+        }
+
+        const releaseData = await response.json();
 
         this.store.appUpdate = {
           version,
@@ -130,7 +133,7 @@ export default defineComponent({
           (storageVersion != '' && storageVersion != version && this.isOnProductionHost) ||
           import.meta.env.VITE_UPDATE_TEST === 'test';
       } catch (error) {
-        console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
+        console.error(error);
       }
 
       StorageManager.setStringValue(STORAGE_VERSION_KEY, version);

src/components/JournalView/JournalOptions.vue

@@ -269,9 +269,9 @@ export default defineComponent({
 
       this.searchTimeout = window.setTimeout(async () => {
         try {
-          const suggestions: string[] = await (
+          const suggestions: string[] = await this.apiStore.client.get(
-            await this.apiStore.client!.get(`api/get${type}Suggestions?name=${value}`)
+            `api/get${type}Suggestions?name=${value}`
-          ).data;
+          );
 
           this[`${type}Suggestions`] = suggestions;
         } catch (error) {

src/components/JournalView/JournalTimetables/EntryDetails.vue

@@ -201,22 +201,20 @@ const driverRouteLocation = computed<RouteLocationRaw | null>(() => {
 
 async function fetchTimetableDetails() {
   try {
-    const responseData = await apiStore.client!.get<API.TimetableHistory.Response>(
+    const responseData = await apiStore.client.get<API.TimetableHistory.Response>(
       'api/getTimetables',
       {
-        params: {
+        timetableId: props.timetableEntry.id,
-          timetableId: props.timetableEntry.id,
+        returnType: 'detailed'
-          returnType: 'detailed'
-        }
       }
     );
 
-    if (!responseData || responseData.data.length != 1) {
+    if (!responseData || responseData.length != 1) {
       timetableDetails.value = null;
       return;
     }
 
-    timetableDetails.value = responseData.data[0];
+    timetableDetails.value = responseData[0];
   } catch (error) {
     // this.dataStatus = Status.Data.Error;
     console.error(error);

src/components/SceneryView/SceneryDispatchersHistory.vue

@@ -127,9 +127,8 @@ export default defineComponent({
           this.station?.name || this.onlineScenery?.name
         }&countFrom=${countFrom}&countLimit=${countLimit}`;
 
-        const historyAPIData: API.DispatcherHistory.Response = await (
+        const historyAPIData: API.DispatcherHistory.Response =
-          await this.apiStore.client!.get(requestString)
+          await this.apiStore.client.get(requestString);
-        ).data;
 
         this.dataStatus = Status.Data.Loaded;
         return historyAPIData;

src/components/SceneryView/SceneryTimetablesHistory.vue

@@ -149,11 +149,12 @@ export default defineComponent({
       requestFilters['returnType'] = 'short';
 
       try {
-        const response: API.TimetableHistory.ResponseShort = await (
+        const response: API.TimetableHistory.ResponseShort = await this.apiStore.client.get(
-          await this.apiStore.client!.get('api/getTimetables', {
+          'api/getTimetables',
-            params: requestFilters
+          requestFilters
-          })
+        );
-        ).data;
+
+        console.log(response);
 
         this.historyList = response;
 

src/http.ts

@@ -0,0 +1,23 @@
+export class HttpClient {
+  constructor(private readonly baseURL: string) {}
+
+  async get<T>(url: string, params?: Record<string, any>): Promise<T> {
+    const absoluteURL = new URL(this.baseURL + '/' + url);
+
+    if (params) {
+      Object.keys(params).forEach((key) => {
+        if (params[key] === undefined) return;
+
+        absoluteURL.searchParams.append(key, params[key]);
+      });
+    }
+
+    const data = await fetch(absoluteURL);
+
+    if (!data.ok) {
+      throw new Error(`Cannot fetch: ${absoluteURL}`);
+    }
+
+    return data.json();
+  }
+}

src/store/apiStore.ts

@@ -2,7 +2,20 @@ import { defineStore } from 'pinia';
 import { API } from '../typings/api';
 import { Status } from '../typings/common';
 import { StationJSONData } from './typings';
-import axios, { AxiosInstance } from 'axios';
+import { HttpClient } from '../http';
+
+let baseURL = 'https://stacjownik.spythere.eu';
+
+switch (import.meta.env.VITE_API_MODE) {
+  case 'development':
+    baseURL = 'http://localhost:3001';
+    break;
+  case 'mocking':
+    baseURL = 'http://localhost:3123';
+    break;
+  default:
+    break;
+}
 
 export const useApiStore = defineStore('apiStore', {
   state: () => ({
@@ -25,30 +38,13 @@ export const useApiStore = defineStore('apiStore', {
     nextUpdateTime: 0,
     nextDataCheckTime: 0,
 
-    client: undefined as AxiosInstance | undefined,
+    client: new HttpClient(baseURL),
 
     activeDataScheduler: undefined as number | undefined
   }),
 
   actions: {
     async setupAPIData() {
-      let baseURL = 'https://stacjownik.spythere.eu';
-
-      switch (import.meta.env.VITE_API_MODE) {
-        case 'development':
-          baseURL = 'http://localhost:3001';
-          break;
-        case 'mocking':
-          baseURL = 'http://localhost:3123';
-          break;
-        default:
-          break;
-      }
-
-      this.client = axios.create({
-        baseURL
-      });
-
       this.connectToAPI();
     },
 
@@ -82,9 +78,9 @@ export const useApiStore = defineStore('apiStore', {
       if (!this.activeData) this.dataStatuses.connection = Status.Data.Loading;
 
       try {
-        const response = await this.client!.get<API.ActiveData.Response>('api/getActiveData');
+        const response = await this.client.get<API.ActiveData.Response>('api/getActiveData');
 
-        this.activeData = response.data;
+        this.activeData = response;
         this.dataStatuses.connection = Status.Data.Loaded;
       } catch (error) {
         this.dataStatuses.connection = Status.Data.Error;
@@ -94,9 +90,9 @@ export const useApiStore = defineStore('apiStore', {
 
     async fetchDonatorsData() {
       try {
-        const response = await this.client!.get<API.Donators.Response>('api/getDonators');
+        const response = await this.client.get<API.Donators.Response>('api/getDonators');
 
-        this.donatorsData = response.data;
+        this.donatorsData = response;
       } catch (error) {
         console.error('Ups! Wystąpił błąd podczas pobierania informacji o donatorach:', error);
       }
@@ -104,9 +100,7 @@ export const useApiStore = defineStore('apiStore', {
 
     async fetchStationsGeneralInfo() {
       try {
-        const sceneryData: StationJSONData[] = (
+        const sceneryData = await this.client.get<StationJSONData[]>(`api/getSceneries`);
-          await this.client!.get<StationJSONData[]>(`api/getSceneries`)
-        ).data;
 
         this.dataStatuses.sceneries = Status.Data.Loaded;
         this.sceneryData = sceneryData;
@@ -118,10 +112,10 @@ export const useApiStore = defineStore('apiStore', {
 
     async fetchVehiclesInfo() {
       try {
-        const response = await this.client!.get<API.VehiclesData.Response>('api/getVehiclesData');
+        const response = await this.client.get<API.VehiclesData.Response>('api/getVehiclesData');
 
-        this.vehiclesData = response.data;
+        this.vehiclesData = response;
-        this.dataStatuses.vehicles = response.data ? Status.Data.Loaded : Status.Data.Warning;
+        this.dataStatuses.vehicles = response ? Status.Data.Loaded : Status.Data.Warning;
       } catch (error) {
         this.dataStatuses.vehicles = Status.Data.Error;
         console.error('Ups! Wystąpił błąd podczas pobierania informacji o pojazdach:', error);
@@ -130,9 +124,7 @@ export const useApiStore = defineStore('apiStore', {
 
     async fetchDailyStats() {
       try {
-        const res: API.DailyStats.Response = await (
+        const res = await this.client.get<API.DailyStats.Response>('api/getDailyStats');
-          await this.client!.get('api/getDailyStats')
-        ).data;
 
         this.dailyStatsData = res;
 

src/views/JournalDispatchers.vue

@@ -217,9 +217,10 @@ export default defineComponent({
       this.scrollDataLoaded = false;
       this.currentQueryParams['countFrom'] = this.historyList.length;
 
-      const responseData: API.DispatcherHistory.Response = await (
+      const responseData: API.DispatcherHistory.Response = await await this.apiStore.client.get(
-        await this.apiStore.client!.get(`api/getDispatchers`, { params: this.currentQueryParams })
+        `api/getDispatchers`,
-      ).data;
+        this.currentQueryParams
+      );
 
       if (!responseData) return;
 
@@ -276,9 +277,10 @@ export default defineComponent({
       this.currentQueryParams = queryParams;
 
       try {
-        const responseData: API.DispatcherHistory.Response = await (
+        const responseData: API.DispatcherHistory.Response = await this.apiStore.client.get(
-          await this.apiStore.client!.get(`api/getDispatchers`, { params: this.currentQueryParams })
+          `api/getDispatchers`,
-        ).data;
+          this.currentQueryParams
+        );
 
         if (!responseData) {
           this.dataStatus = Status.Data.Error;

src/views/JournalTimetables.vue

@@ -277,11 +277,10 @@ export default defineComponent({
 
       this.currentQueryParams['countFrom'] = this.timetableHistory.length;
 
-      const responseData: API.TimetableHistory.Response = await (
+      const responseData: API.TimetableHistory.Response = await this.apiStore.client.get(
-        await this.apiStore.client!.get('api/getTimetables', {
+        'api/getTimetables',
-          params: this.currentQueryParams
+        this.currentQueryParams
-        })
+      );
-      ).data;
 
       if (!responseData) return;
 
@@ -400,11 +399,10 @@ export default defineComponent({
       this.currentQueryParams = queryParams;
 
       try {
-        const responseData: API.TimetableHistory.ResponseShort = await (
+        const responseData: API.TimetableHistory.ResponseShort = await this.apiStore.client.get(
-          await this.apiStore.client!.get('api/getTimetables', {
+          'api/getTimetables',
-            params: this.currentQueryParams
+          this.currentQueryParams
-          })
+        );
-        ).data;
 
         if (!responseData) {
           this.dataStatus = Status.Data.Error;

src/views/PlayerProfileView.vue

@@ -40,7 +40,6 @@ import Loading from '../components/Global/Loading.vue';
 import ProfileSummary from '../components/PlayerProfileView/ProfileSummary.vue';
 import ProfileRecentStats from '../components/PlayerProfileView/ProfileRecentStats.vue';
 import ProfileHistoryList from '../components/PlayerProfileView/ProfileHistoryList.vue';
-import axios from 'axios';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -71,29 +70,28 @@ onDeactivated(() => {
 });
 
 async function fetchPlayerInfo(playerId: number) {
-  return apiStore.client!.get<API.PlayerInfo.Data>('api/getPlayerInfo', {
+  return apiStore.client.get<API.PlayerInfo.Data>('api/getPlayerInfo', {
-    params: {
+    playerId
-      playerId
-    }
   });
 }
 
 async function fetchPlayerJournal(playerId: number) {
-  return apiStore.client!.get<API.PlayerJournal.Data>('api/getPlayerJournal', {
+  return apiStore.client.get<API.PlayerJournal.Data>('api/getPlayerJournal', {
-    params: {
+    playerId,
-      playerId,
+    dateScope: '30d'
-      dateScope: '30d'
-    }
   });
 }
 
-async function fetchPlayerTd2Info(playerName: string) {
+async function fetchPlayerTd2Info(playerName: string): Promise<Td2API.UsersInfoByName.Response> {
-  return axios.get<Td2API.UsersInfoByName.Response>('https://api.td2.info.pl', {
+  const response = await fetch(
-    params: {
+    `https://api.td2.info.pl?method=getUsersInfoByName&name=${playerName}`
-      method: 'getUsersInfoByName',
+  );
-      name: playerName
+
-    }
+  if (!response.ok) {
-  });
+    throw new Error('fetchPlayerTd2Info: could not fetch data');
+  }
+
+  return response.json();
 }
 
 async function fetchPlayerData() {
@@ -116,23 +114,21 @@ async function fetchPlayerData() {
     const playerInfoResp = await fetchPlayerInfo(playerId.value);
 
     playerName.value =
-      playerInfoResp.data.driverStats.driverName ||
+      playerInfoResp.driverStats.driverName || playerInfoResp.dispatcherStats.dispatcherName || '';
-      playerInfoResp.data.dispatcherStats.dispatcherName ||
-      '';
 
     if (!playerName.value) {
       router.push('/');
       return;
     }
 
-    playerInfo.value = playerName.value ? playerInfoResp.data : undefined;
+    playerInfo.value = playerName.value ? playerInfoResp : undefined;
     playerInfoStatus.value = Status.Data.Loaded;
 
     if (playerName.value) {
       const playerTD2InfoResp = await fetchPlayerTd2Info(playerName.value);
 
-      if (playerTD2InfoResp.data.success && playerTD2InfoResp.data.message.length == 1) {
+      if (playerTD2InfoResp.success && playerTD2InfoResp.message.length == 1) {
-        playerTD2Info.value = playerTD2InfoResp.data.message[0];
+        playerTD2Info.value = playerTD2InfoResp.message[0];
       }
     }
   } catch (error) {
@@ -144,7 +140,7 @@ async function fetchPlayerData() {
   try {
     const playerJournalResp = await fetchPlayerJournal(playerId.value);
 
-    playerJournal.value = playerJournalResp.data;
+    playerJournal.value = playerJournalResp;
     playerJournalStatus.value = Status.Data.Loaded;
   } catch (error) {
     playerJournal.value = undefined;

yarn.lock

@@ -1778,11 +1778,6 @@ async@^3.2.6:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
   integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -1795,15 +1790,6 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-axios@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
-  integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.4"
-    proxy-from-env "^1.1.0"
-
 babel-plugin-polyfill-corejs2@^0.4.14:
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz#8101b82b769c568835611542488d463395c2ef8f"
@@ -1951,13 +1937,6 @@ colorette@^2.0.20:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2101,11 +2080,6 @@ defu@^6.1.4:
   resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479"
   integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
 detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
@@ -2329,11 +2303,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-follow-redirects@^1.15.6:
-  version "1.15.11"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
-  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
-
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
@@ -2341,17 +2310,6 @@ for-each@^0.3.3, for-each@^0.3.5:
   dependencies:
     is-callable "^1.2.7"
 
-form-data@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
-  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.2"
-    mime-types "^2.1.12"
-
 fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -2881,18 +2839,6 @@ micromatch@^4.0.5:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
 minimatch@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -3046,11 +2992,6 @@ pretty-bytes@^6.1.1:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.1.1.tgz#38cd6bb46f47afbf667c202cfc754bffd2016a3b"
   integrity sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
 punycode@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"