Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 44 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"unplugin-vue-router": "^0.19.0",
"vite": "^7.3.2",
"vite-plugin-vuetify": "^2.1.2",
"vite-tsconfig-paths": "^6.1.1",
"vitest": "^4.0.15",
"vue-router": "^4.6.3",
"vue-tsc": "^3.2.6"
Expand Down
9 changes: 9 additions & 0 deletions src/api/clients/api.client.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import axios from "axios";

export const apiClient = axios.create({
baseURL: import.meta.env.VITE_SPOTIFY_ENDPOINT,
timeout: 10_000,
headers: {
"Content-Type": "application/x-www-form-urlencoded"
}
});
8 changes: 0 additions & 8 deletions src/api/clients.ts → src/api/clients/auth.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,3 @@ export const authApiClient = axios.create({
"Content-Type": "application/x-www-form-urlencoded"
}
});

export const apiClient = axios.create({
baseURL: import.meta.env.VITE_SPOTIFY_ENDPOINT,
timeout: 10_000,
headers: {
"Content-Type": "application/x-www-form-urlencoded"
}
});
2 changes: 2 additions & 0 deletions src/api/clients/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { apiClient } from "./api.client";
export { authApiClient } from "./auth.client";
4 changes: 2 additions & 2 deletions src/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import "./interceptors";
import "./clients";
export { setupInterceptors } from "./setup.interceptors";
export * from "./clients";
16 changes: 16 additions & 0 deletions src/api/interceptors/auth.interceptor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import type { InternalAxiosRequestConfig } from "axios";

type AuthStoreLike = {
accessToken: string | undefined;
};

export const createAuthRequestInterceptor =
(authStore: AuthStoreLike) =>
(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig => {
if (authStore.accessToken) {
config.headers = config.headers ?? {};
config.headers.Authorization = `Bearer ${authStore.accessToken}`;
}

return config;
};
15 changes: 0 additions & 15 deletions src/api/interceptors/auth.ts

This file was deleted.

6 changes: 3 additions & 3 deletions src/api/interceptors/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import "./refresh-token"
import "./rate-limit"
import "./auth"
export * from "./auth.interceptor";
export * from "./refresh-token.interceptor";
export * from "./rate-limit.interceptor";
38 changes: 38 additions & 0 deletions src/api/interceptors/rate-limit.interceptor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import type { AxiosError, AxiosInstance, InternalAxiosRequestConfig } from "axios";

export const createRateLimitInterceptor =
(client: AxiosInstance) =>
async (error: AxiosError) => {
const config = error.config as InternalAxiosRequestConfig | undefined;

if (!config || !error.response) {
return Promise.reject(error);
}

if (error.response.status !== 429) {
return Promise.reject(error);
}

const method = config.method?.toLowerCase();

const safeMethods = ["get", "head", "put", "delete"];

if (!method || !safeMethods.includes(method)) {
return Promise.reject(error);
}

const retryAfterSecs = parseInt(
error.response.headers["retry-after"],
10
);

const delayMs =
(Number.isFinite(retryAfterSecs) ? retryAfterSecs : 1) * 1000;

const wait = (ms: number) =>
new Promise((res) => setTimeout(res, ms));

await wait(Math.min(delayMs, 120_000));

return client.request(config);
};
26 changes: 0 additions & 26 deletions src/api/interceptors/rate-limit.ts

This file was deleted.

Loading