Skip to content

Commit 3ca23c3

Browse files
KathundKathund
committed
feat(RequestHandler): Set Base URL
1 parent 4ca9f1b commit 3ca23c3

40 files changed

+128
-11
lines changed

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
DOTENV_CONFIG_QUIET=true
22
HYPIXEL_KEY=HYPIXEL_API_KEY
3+
HYPIXEL_URL=https://api.hypixel.net/v2

‎src/API/getAchievements.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import type { AchievementTier } from '../Types/Static.js';
99

1010
test('getAchievements (raw)', async () => {
1111
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
12+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1213
const data = await client.getAchievements({ raw: true });
1314
expect(data).toBeDefined();
1415
expect(data).toBeInstanceOf(RequestData);
@@ -19,6 +20,7 @@ test('getAchievements (raw)', async () => {
1920

2021
test('getAchievements', async () => {
2122
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
23+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2224
const data = await client.getAchievements();
2325
expect(data).toBeDefined();
2426
expect(data).toBeInstanceOf(Achievements);

‎src/API/getActiveHouses.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type { WithRaw } from '../Types/API.js';
66

77
test('getActiveHouses (raw)', async () => {
88
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
9+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
910
const data = await client.getActiveHouses({ raw: true });
1011
expect(data).toBeDefined();
1112
expect(data).toBeInstanceOf(RequestData);
@@ -16,6 +17,7 @@ test('getActiveHouses (raw)', async () => {
1617

1718
test('getActiveHouses', async () => {
1819
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
20+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1921
const data = await client.getActiveHouses();
2022
expect(data).toBeDefined();
2123
expectTypeOf(data).toEqualTypeOf<WithRaw<House[]> | RequestData>();

‎src/API/getBoosters.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { WithRaw } from '../Types/API.js';
88

99
test('getBoosters (raw)', async () => {
1010
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
11+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1112
const data = await client.getBoosters({ raw: true });
1213
expect(data).toBeDefined();
1314
expect(data).toBeInstanceOf(RequestData);
@@ -18,6 +19,7 @@ test('getBoosters (raw)', async () => {
1819

1920
test('getBoosters', async () => {
2021
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
22+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2123
const data = await client.getBoosters();
2224
expect(data).toBeDefined();
2325
expectTypeOf(data).toEqualTypeOf<WithRaw<Booster[]> | RequestData>();

‎src/API/getChallenges.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { ChallengeReward } from '../Types/Static.js';
88

99
test('getChallenges (raw)', async () => {
1010
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
11+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1112
const data = await client.getChallenges({ raw: true });
1213
expect(data).toBeDefined();
1314
expect(data).toBeInstanceOf(RequestData);
@@ -18,6 +19,7 @@ test('getChallenges (raw)', async () => {
1819

1920
test('getChallenges', async () => {
2021
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
22+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2123
const data = await client.getChallenges();
2224
expect(data).toBeDefined();
2325
expect(data).toBeInstanceOf(Challenges);

‎src/API/getGameCounts.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { expect, expectTypeOf, test } from 'vitest';
55

66
test('getGameCounts (raw)', async () => {
77
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
8+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
89
const data = await client.getGameCounts({ raw: true });
910
expect(data).toBeDefined();
1011
expect(data).toBeInstanceOf(RequestData);
@@ -16,6 +17,7 @@ test('getGameCounts (raw)', async () => {
1617

1718
test('getGameCounts', async () => {
1819
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
20+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1921
const data = await client.getGameCounts();
2022
expect(data).toBeDefined();
2123
expect(data).toBeInstanceOf(GameCounts);

‎src/API/getGuild.test.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ import type { GameCode, GameID, GameString } from '../Types/Game.js';
1313

1414
test('Invalid Guild Type', async () => {
1515
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
16-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
16+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
1717
// @ts-expect-error
1818
await expect(() => client.getGuild('invalid', 'invalid')).rejects.toThrowError(Errors.INVALID_GUILD_SEARCH_PARAMETER);
1919
client.destroy();
2020
});
2121

2222
test('Invalid Guild', async () => {
2323
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
24+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2425
await expect(() => client.getGuild('name', 'this guild dose not exist')).rejects.toThrowError(
2526
Errors.GUILD_DOES_NOT_EXIST
2627
);
@@ -29,20 +30,22 @@ test('Invalid Guild', async () => {
2930

3031
test('Invalid Guild ID', async () => {
3132
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
33+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
3234
await expect(() => client.getGuild('id', 'invalid guild id')).rejects.toThrowError(Errors.INVALID_GUILD_ID);
3335
client.destroy();
3436
});
3537

3638
test('No Guild Query', async () => {
3739
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
38-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
40+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
3941
// @ts-expect-error
4042
await expect(() => client.getGuild('id')).rejects.toThrowError(Errors.NO_GUILD_QUERY);
4143
client.destroy();
4244
});
4345

4446
test('User not in a guild', async () => {
4547
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
48+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
4649
const data = await client.getGuild('player', '37501e7512b845ab8796e2baf9e9677a');
4750
expect(data).toBeDefined();
4851
expectTypeOf(data).toEqualTypeOf<Guild | null | RequestData>();
@@ -51,6 +54,7 @@ test('User not in a guild', async () => {
5154

5255
test('getGuild (raw)', async () => {
5356
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
57+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
5458
const data = await client.getGuild('name', 'Pixelic', { raw: true });
5559
expect(data).toBeDefined();
5660
expect(data).toBeInstanceOf(RequestData);
@@ -62,6 +66,7 @@ test('getGuild (raw)', async () => {
6266

6367
test('getGuild (Name)', async () => {
6468
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
69+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
6570
const data = await client.getGuild('name', 'Pixelic');
6671
expect(data).toBeDefined();
6772
expect(data).toBeInstanceOf(Guild);
@@ -246,6 +251,7 @@ test('getGuild (Name)', async () => {
246251

247252
test('getGuild (Id)', async () => {
248253
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
254+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
249255
const data = await client.getGuild('id', '64b54f9d8ea8c96aaedafe84');
250256
expect(data).toBeDefined();
251257
expect(data).toBeInstanceOf(Guild);
@@ -430,6 +436,7 @@ test('getGuild (Id)', async () => {
430436

431437
test('getGuild (Player)', async () => {
432438
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
439+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
433440
const data = await client.getGuild('player', '14727faefbdc4aff848cd2713eb9939e');
434441
expect(data).toBeDefined();
435442
expect(data).toBeInstanceOf(Guild);

‎src/API/getGuildAchievements.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { AchievementTier } from '../Types/Static.js';
88

99
test('getGuildAchievements (raw)', async () => {
1010
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
11+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1112
const data = await client.getGuildAchievements({ raw: true });
1213
expect(data).toBeDefined();
1314
expect(data).toBeInstanceOf(RequestData);
@@ -19,6 +20,7 @@ test('getGuildAchievements (raw)', async () => {
1920

2021
test('getGuildAchievements', async () => {
2122
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
23+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2224
const data = await client.getGuildAchievements();
2325
expect(data).toBeDefined();
2426
expectTypeOf(data).toEqualTypeOf<GuildAchievements | RequestData>();

‎src/API/getHouse.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { expect, expectTypeOf, test } from 'vitest';
66

77
test('getHouse (raw)', async () => {
88
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
9+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
910
const houses = (await client.getActiveHouses()) as House[];
1011
if (undefined === houses[0]) return;
1112
const data = await client.getHouse(houses[0].uuid, { raw: true });
@@ -18,6 +19,7 @@ test('getHouse (raw)', async () => {
1819

1920
test('getHouse (no input)', async () => {
2021
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
22+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2123
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
2224
// @ts-expect-error
2325
await expect(() => client.getHouse()).rejects.toThrowError(Errors.NO_UUID);
@@ -26,6 +28,7 @@ test('getHouse (no input)', async () => {
2628

2729
test('getHouse', async () => {
2830
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
31+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2932
const houses = (await client.getActiveHouses()) as House[];
3033
if (undefined === houses[0]) return;
3134
expect(houses).toBeDefined();

‎src/API/getLeaderboards.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { WithRaw } from '../Types/API.js';
88

99
test('getLeaderboards (raw)', async () => {
1010
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
11+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
1112
const data = await client.getLeaderboards({ raw: true });
1213
expect(data).toBeDefined();
1314
expect(data).toBeInstanceOf(RequestData);
@@ -18,6 +19,7 @@ test('getLeaderboards (raw)', async () => {
1819

1920
test('getLeaderboards', async () => {
2021
const client = new Client(process.env.HYPIXEL_KEY ?? '', { cache: false, checkForUpdates: false, rateLimit: 'NONE' });
22+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
2123
const data = await client.getLeaderboards();
2224
expect(data).toBeDefined();
2325
expectTypeOf(data).toEqualTypeOf<WithRaw<Record<string, Leaderboard[]>> | RequestData>();
@@ -57,6 +59,7 @@ test('getLeaderboards', async () => {
5759

5860
test('getLeaderboards (Missing Data)', async () => {
5961
const client = new Client(process.env.HYPIXEL_KEY ?? '');
62+
client.requestHandler.setBaseURL(process.env.HYPIXEL_URL);
6063
vi.spyOn(global, 'fetch').mockResolvedValue({
6164
...defaultRequestData,
6265
json: () => Promise.resolve({ success: true })

0 commit comments

Comments
 (0)