feat: new music lib

leomotors · Oct 4, 2024 · 2d3259a · 2d3259a
1 parent 50a5935
commit 2d3259a
Show file tree

Hide file tree

Showing 8 changed files with 344 additions and 66 deletions.
diff --git a/packages/cocoa-discord/CHANGELOG.md b/packages/cocoa-discord/CHANGELOG.md
@@ -11,6 +11,10 @@ See also: [GitHub Releases](https://github.com/leomotors/cocoa-discord/releases)
 - Not all change will be noted, see commits for _full_ changelog
 - Some pre-release or beta build may not appear here
 
+## [3.2.0] - 2024-10-05
+
+- chore: bump deps
+
 ## [3.1.0] - 2023-09-25
 
 - feat(template): status embed -> Running On fields now show Bun if is running on Bun

diff --git a/packages/cocoa-discord/package.json b/packages/cocoa-discord/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cocoa-discord",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Yet another Discord Bot Utility npm package",
   "main": "dist/main/index.js",
   "type": "module",
@@ -38,7 +38,7 @@
     "rimraf": "^6.0.1",
     "sinon": "^19.0.2",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.26.7",
+    "typedoc": "^0.26.8",
     "typescript": "^5.6.2",
     "vitest": "^2.1.2"
   },

diff --git a/packages/music-module/CHANGELOG.md b/packages/music-module/CHANGELOG.md
@@ -10,6 +10,11 @@ See also: [GitHub Releases](https://github.com/leomotors/cocoa-discord/releases)
 - Not all change will be noted, see commits for _full_ changelog
 - Some pre-release or beta build may not appear here
 
+## [3.0.0] - 2024-10-05
+
+- feat!: use [@distube/yt-dl](https://github.com/distubejs/ytdl-core) to play video,
+  search still be done using play-dl
+
 ## [2.0.0] - 2024-03-01
 
 - chore: removed patch script as play-dl is fixed

diff --git a/packages/music-module/package.json b/packages/music-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cocoa-discord/music-module",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "discord.js music bot that can be run standalone or as a module for other bots",
   "main": "dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -40,12 +40,13 @@
     "libsodium-wrappers": "^0.7.15",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
-    "typedoc": "^0.26.7",
+    "typedoc": "^0.26.8",
     "typescript": "^5.6.2",
     "vitest": "^2.1.2"
   },
   "dependencies": {
     "@discordjs/voice": "^0.17.0",
+    "@distube/ytdl-core": "^4.14.4",
     "chalk": "^5.3.0",
     "cocoa-discord": "workspace:^",
     "discord.js": "^14.16.3",

diff --git a/packages/music-module/src/adapters/youtube.ts b/packages/music-module/src/adapters/youtube.ts
@@ -1,3 +1,5 @@
+import ytdl from "@distube/ytdl-core";
+
 import { CocoaEmbed, EmbedStyle } from "cocoa-discord";
 import { SlashCommand } from "cocoa-discord/slash/class";
 
@@ -16,12 +18,9 @@ export class YoutubeAdapter implements Playable {
   constructor(readonly video: play.YouTubeVideo) {}
 
   async getAudioResource(): Promise<AudioResource> {
-    const stream = await play.stream(this.video.url);
-
-    const resource = createAudioResource(stream.stream, {
-      inputType: stream.type,
-    });
+    const stream = ytdl(this.video.url, { filter: "audioonly" });
 
+    const resource = createAudioResource(stream);
     return resource;
   }
 

diff --git a/packages/music-module/src/core/voice.ts b/packages/music-module/src/core/voice.ts
@@ -157,6 +157,8 @@ export async function playNextMusicInQueue(guildId: string) {
   state.isPlaying = true;
   state.playingSince = new Date().getTime();
 
+  console.log(state);
+
   return await new Promise<boolean>((resolve, reject) => {
     audioPlayer.on(AudioPlayerStatus.Idle, () => {
       playNextMusicInQueue(guildId);

diff --git a/packages/music-module/tests/bot.js b/packages/music-module/tests/bot.js
@@ -40,7 +40,11 @@ center.addModules(
 );
 center.useHelpCommand(style);
 center.on("error", async (name, err, ctx) => {
-  await ctx.channel?.send(`Error ${err}`);
+  if (ctx.channel?.isSendable()) {
+    await ctx.channel.send(`Error ${err}`);
+  } else {
+    console.error(`Error occured in unsendable channel: ${ctx.channelId}`);
+  }
   await client.destroy();
 
   // * FOR DEBUG PURPOSES ONLY, Don't do this on production