Music package

Author: barnabwhy

client.js

@@ -28,33 +28,24 @@ let { handleCmdMsg, handleReaction, handleMemberJoin, handleMemberLeave } = requ
 
 // On message handle command
 client.on('message', async msg => {
-    handleCmdMsg(msg, musicWorker)
+    handleCmdMsg(msg)
 });
 // Handle reactions
 client.on('messageReactionAdd', async (reaction, user) => {
-    handleReaction(reaction, user, musicWorker, false)
+    handleReaction(reaction, user, false)
 });
 client.on('messageReactionRemove', async (reaction, user) => {
-    handleReaction(reaction, user, musicWorker, true)
+    handleReaction(reaction, user, true)
 });
 // Handle member join
 client.on('guildMemberAdd', async member => {
-    handleMemberJoin(member, musicWorker)
+    handleMemberJoin(member)
 });
 // Handle member leave
 client.on('guildMemberRemove', async member => {
-    handleMemberLeave(member, musicWorker)
+    handleMemberLeave(member)
 });
 
-// Create music worker
-let musicWorker;
-if(process.env.MUSIC_ENABLED == "true") {
-    const { Worker } = require('worker_threads');
-
-    const musicWorkerPath = '/modules/music-worker.js'
-    musicWorker = new Worker(__dirname+musicWorkerPath) // Spawn worker
-}
-
 var path = require('path'); 
 
 // Create web_images directory if required

modules/handler.js

@@ -15,18 +15,32 @@ let { findImage, sendImage } = require("./utils");
 
 const { parseMsg, isCmd } = require("./parse");
 
-async function handleCmdMsg(msg, musicWorker) {
+let runMusicCmd;
+if(process.env.MUSIC_ENABLED == "true") {
+    runMusicCmd = require("@frogebot/music")({
+      BOT_NAME: process.env.BOT_NAME,
+      EMBED_COLOUR: process.env.EMBED_COLOUR,
+      MSG_VIBING: process.env.MSG_VIBING,
+      MSG_UNVIBING: process.env.MSG_UNVIBING,
+      SKIP_PERCENT: process.env.SKIP_PERCENT,
+      USE_MUSIC_ROLE: process.env.USE_MUSIC_ROLE,
+      MUSIC_ROLE_NAME: process.env.MUSIC_ROLE_NAME,
+      TOKEN: process.env.TOKEN
+    })
+}
+
+async function handleCmdMsg(msg) {
   if (msg.author.bot || !(await isCmd(msg))) return; // If not command or called by bot
 
   let parsed = await parseMsg(msg); // Parses message, returns [0: Prefix, 1: Command, 2: Args string]
 
   let cmd = commands[parsed[1]];
   let args = parsed[2];
 
-  handleCmd(msg, cmd, args, musicWorker);
+  handleCmd(msg, cmd, args);
 }
 
-async function handleCmd(msg, cmd, args, musicWorker) {
+async function handleCmd(msg, cmd, args) {
   let startTime = new Date().getTime();
 
   if (cmd.type == "script") {
@@ -126,19 +140,12 @@ async function handleCmd(msg, cmd, args, musicWorker) {
       procMsg.delete();
     }
   } else if (cmd.type == "music" && process.env.MUSIC_ENABLED == "true") {
-    // If command is set as music type
-    musicWorker.postMessage({
-      msgId: msg.id,
-      interaction: msg.interaction,
-      channelId: msg.channel.id,
-      args,
-      cmd,
-    });
+    runMusicCmd(msg, args, cmd);
   }
 }
 
 const { getShortcode } = require("discord-emoji-converter");
-async function handleReaction(reaction, user, musicWorker, remove) {
+async function handleReaction(reaction, user, remove) {
   if (reaction.partial) {
     try {
       await reaction.fetch();
@@ -187,8 +194,8 @@ async function handleReaction(reaction, user, musicWorker, remove) {
     }
   });
 }
-async function handleMemberJoin(member, musicWorker) {}
-async function handleMemberLeave(member, musicWorker) {}
+async function handleMemberJoin(member) {}
+async function handleMemberLeave(member) {}
 
 module.exports = {
   handleCmdMsg,