Rewrite Requests

Kathund · Sep 11, 2024 · dfaa2a2 · dfaa2a2
1 parent 539816a
commit dfaa2a2
Show file tree

Hide file tree

Showing 30 changed files with 299 additions and 658 deletions.
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "discord.js": "^14.16.1",
     "express": "^4.19.2",
     "express-session": "^1.18.0",
+    "node-cache": "^5.1.2",
     "winston": "^3.14.2"
   },
   "devDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/Application.ts b/src/Application.ts
@@ -1,18 +1,36 @@
 import * as config from '../config.json';
+import CacheHandler from './Private/CacheHandler';
 import DiscordManager from './Discord/DiscordManager';
 import Logger from './utils/Logger';
+import RequestHandler from './Private/RequestHandler';
 import SpotifyManager from './Spotify/SpotifyManager';
 
+interface Errors {
+  NOT_LOGGED_IN: string;
+  NOTHING_PLAYING: string;
+}
+
+const errors: Errors = {
+  NOT_LOGGED_IN: 'Account isnt logged in.',
+  NOTHING_PLAYING: 'Nothing is playing.'
+};
+
 class Application {
-  Logger: Logger;
-  discord: DiscordManager;
-  spotify: SpotifyManager;
   readonly config: typeof config;
+  declare Logger: Logger;
+  declare discord: DiscordManager;
+  declare spotify: SpotifyManager;
+  declare cacheHandler: CacheHandler;
+  declare requestHandler: RequestHandler;
+  declare errors: Errors;
   constructor() {
     this.config = config;
     this.Logger = new Logger();
     this.discord = new DiscordManager(this);
     this.spotify = new SpotifyManager(this);
+    this.cacheHandler = new CacheHandler();
+    this.requestHandler = new RequestHandler(this);
+    this.errors = errors;
   }
 
   connect(): void {

diff --git a/src/Discord/commands/Pause.ts b/src/Discord/commands/Pause.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Playback from '../../Spotify/Private/API/Playback';
 import {
   ApplicationIntegrationType,
   BaseMessageOptions,
@@ -23,25 +22,8 @@ class PauseCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
-      const res = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/pause`);
-      if (403 === res.status || 401 === res.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.' });
-        return;
-      }
-      if (204 === res.status) {
-        await interaction.followUp({ content: 'Nothing is playing.' });
-        return;
-      }
-      const data = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/status`);
-      if (403 === data.status || 401 === data.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.' });
-        return;
-      }
-      if (204 === data.status) {
-        await interaction.followUp({ content: 'Nothing is playing.' });
-        return;
-      }
-      const playback = new Playback((await data.json()).data);
+      await this.discord.Application.spotify.requestHandler.pause();
+      const playback = await this.discord.Application.spotify.requestHandler.getStatus();
       const sendData: BaseMessageOptions = { embeds: [playback.toEmbed()], components: playback.toButtons() };
       if (interaction.isButton()) {
         await interaction.update(sendData);

diff --git a/src/Discord/commands/Play.ts b/src/Discord/commands/Play.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Playback from '../../Spotify/Private/API/Playback';
 import {
   ApplicationIntegrationType,
   BaseMessageOptions,
@@ -23,25 +22,8 @@ class PlayCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
-      const res = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/play`);
-      if (403 === res.status || 401 === res.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (204 === res.status) {
-        await interaction.followUp({ content: 'Nothing is playing.', ephemeral: true });
-        return;
-      }
-      const data = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/status`);
-      if (403 === data.status || 401 === data.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (204 === data.status) {
-        await interaction.followUp({ content: 'Nothing is playing.', ephemeral: true });
-        return;
-      }
-      const playback = new Playback((await data.json()).data);
+      await this.discord.Application.spotify.requestHandler.play();
+      const playback = await this.discord.Application.spotify.requestHandler.getStatus();
       const sendData: BaseMessageOptions = { embeds: [playback.toEmbed()], components: playback.toButtons() };
       if (interaction.isButton()) {
         await interaction.update(sendData);

diff --git a/src/Discord/commands/Playback.ts b/src/Discord/commands/Playback.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Playback from '../../Spotify/Private/API/Playback';
 import {
   ApplicationIntegrationType,
   BaseMessageOptions,
@@ -23,16 +22,7 @@ class PlaybackCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
-      const res = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/status`);
-      if (403 === res.status || 401 === res.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (204 === res.status) {
-        await interaction.followUp({ content: 'Nothing is playing.', ephemeral: true });
-        return;
-      }
-      const playback = new Playback((await res.json()).data);
+      const playback = await this.discord.Application.spotify.requestHandler.getStatus();
       const sendData: BaseMessageOptions = { embeds: [playback.toEmbed()], components: playback.toButtons() };
       if (interaction.isButton()) {
         await interaction.update(sendData);

diff --git a/src/Discord/commands/Previous.ts b/src/Discord/commands/Previous.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Playback from '../../Spotify/Private/API/Playback';
 import {
   ApplicationIntegrationType,
   BaseMessageOptions,
@@ -23,27 +22,8 @@ class PreviousCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
-      const previousData = await fetch(
-        `http://localhost:${this.discord.Application.config.port}/proxy/playback/previous`
-      );
-      if (403 === previousData.status || 401 === previousData.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (200 !== previousData.status) {
-        await interaction.followUp({ content: 'Something went wrong! Please try again.', ephemeral: true });
-        return;
-      }
-      const data = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/status`);
-      if (403 === data.status || 401 === data.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (204 === data.status) {
-        await interaction.followUp({ content: 'Nothing is playing.', ephemeral: true });
-        return;
-      }
-      const playback = new Playback((await data.json()).data);
+      await this.discord.Application.spotify.requestHandler.previous();
+      const playback = await this.discord.Application.spotify.requestHandler.getStatus();
       const sendData: BaseMessageOptions = { embeds: [playback.toEmbed()], components: playback.toButtons() };
       if (interaction.isButton()) {
         await interaction.update(sendData);

diff --git a/src/Discord/commands/Queue.ts b/src/Discord/commands/Queue.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Queue from '../../Spotify/Private/API/Queue';
 import {
   ApplicationIntegrationType,
   ButtonInteraction,
@@ -23,17 +22,8 @@ class QueueCommand extends Command {
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
       if (!interaction.deferred) await interaction.deferReply({ ephemeral: true });
-      const res = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/queue`);
-      if (403 === res.status || 401 === res.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (204 === res.status) {
-        await interaction.followUp({ content: 'Nothing is playing.', ephemeral: true });
-        return;
-      }
-      const data = new Queue((await res.json()).data);
-      await interaction.followUp({ embeds: [data.toEmbed()], ephemeral: true });
+      const res = await this.discord.Application.spotify.requestHandler.getQueue();
+      await interaction.followUp({ embeds: [res.toEmbed()], ephemeral: true });
     } catch (error) {
       if (error instanceof Error) this.discord.Application.Logger.error(error);
       if (interaction.replied || interaction.deferred) {

diff --git a/src/Discord/commands/Search.ts b/src/Discord/commands/Search.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Search from '../../Spotify/Private/API/Search/Search';
 import {
   ApplicationIntegrationType,
   ChatInputCommandInteraction,
@@ -30,23 +29,8 @@ class SearchCommand extends Command {
         await interaction.reply({ content: 'Please provide a search query.', ephemeral: true });
         return;
       }
-      const res = await fetch(
-        `http://localhost:${this.discord.Application.config.port}/proxy/search/track/${query}/${page}`
-      );
-      if (403 === res.status || 401 === res.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (200 !== res.status) {
-        await interaction.followUp({ content: 'Something went wrong! Please try again.', ephemeral: true });
-        return;
-      }
-      const data = new Search((await res.json()).data);
-      await interaction.followUp({
-        embeds: [data.toEmbed()],
-        components: [data.toButtons(), data.toSelectMenu()],
-        ephemeral: true
-      });
+      const res = await this.discord.Application.spotify.requestHandler.searchTracks(query, page);
+      await interaction.followUp({ embeds: [res.toEmbed()], components: [res.toButtons(), res.toSelectMenu()] });
     } catch (error) {
       if (error instanceof Error) this.discord.Application.Logger.error(error);
       if (interaction.replied || interaction.deferred) {

diff --git a/src/Discord/commands/Shuffle.ts b/src/Discord/commands/Shuffle.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Playback from '../../Spotify/Private/API/Playback';
 import {
   ApplicationIntegrationType,
   BaseMessageOptions,
@@ -23,33 +22,16 @@ class ShuffleCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
-      const res = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/shuffle`);
-      if (403 === res.status || 401 === res.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.' });
-        return;
-      }
-      if (204 === res.status) {
-        await interaction.followUp({ content: 'Nothing is playing.' });
-        return;
-      }
-      const data = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/status`);
-      if (403 === data.status || 401 === data.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.' });
-        return;
-      }
-      if (204 === data.status) {
-        await interaction.followUp({ content: 'Nothing is playing.' });
-        return;
-      }
-      const playback = new Playback((await data.json()).data);
+      await this.discord.Application.spotify.requestHandler.shuffle();
+      const playback = await this.discord.Application.spotify.requestHandler.getStatus();
       const sendData: BaseMessageOptions = { embeds: [playback.toEmbed()], components: playback.toButtons() };
       if (interaction.isButton()) {
         await interaction.update(sendData);
       } else {
         await interaction.followUp(sendData);
       }
       await interaction.followUp({
-        content: `Shuffle ${(await res.json()).state ? 'Enabled' : 'Disabled'}.`,
+        content: `Shuffle ${playback.shuffleState ? 'Enabled' : 'Disabled'}.`,
         ephemeral: true
       });
     } catch (error) {

diff --git a/src/Discord/commands/Skip.ts b/src/Discord/commands/Skip.ts
@@ -1,6 +1,5 @@
 import Command from '../Private/Command';
 import DiscordManager from '../DiscordManager';
-import Playback from '../../Spotify/Private/API/Playback';
 import {
   ApplicationIntegrationType,
   BaseMessageOptions,
@@ -23,25 +22,8 @@ class SkipCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction | ButtonInteraction): Promise<void> {
     try {
-      const skipData = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/next`);
-      if (403 === skipData.status || 401 === skipData.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (200 !== skipData.status) {
-        await interaction.followUp({ content: 'Something went wrong! Please try again.', ephemeral: true });
-        return;
-      }
-      const data = await fetch(`http://localhost:${this.discord.Application.config.port}/proxy/playback/status`);
-      if (403 === data.status || 401 === data.status) {
-        await interaction.followUp({ content: 'Account isnt logged in.', ephemeral: true });
-        return;
-      }
-      if (204 === data.status) {
-        await interaction.followUp({ content: 'Nothing is playing.', ephemeral: true });
-        return;
-      }
-      const playback = new Playback((await data.json()).data);
+      await this.discord.Application.spotify.requestHandler.skip();
+      const playback = await this.discord.Application.spotify.requestHandler.getStatus();
       const sendData: BaseMessageOptions = { embeds: [playback.toEmbed()], components: playback.toButtons() };
       if (interaction.isButton()) {
         await interaction.update(sendData);

diff --git a/src/Discord/commands/Uptime.ts b/src/Discord/commands/Uptime.ts
@@ -20,7 +20,7 @@ class UptimeCommand extends Command {
 
   async execute(interaction: ChatInputCommandInteraction): Promise<void> {
     try {
-      await interaction.reply({
+      await interaction.followUp({
         content: `Online since <t:${Math.floor((Date.now() - interaction.client.uptime) / 1000)}:R>`
       });
     } catch (error) {