Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate discord.js to 13.8.1 #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Migrate discord.js to 13.8.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6805abb
Migrate discord.js to 13.8.1
NVedsted Jun 26, 2022
02afae0
Bump @discordjs/voice version for voice packet bugfix
NVedsted Jul 24, 2022
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
57 changes: 37 additions & 20 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,16 @@ function updateWitAIAppLang(appID, lang, cb) {


const Discord = require('discord.js')
const DiscoidVoice = require('@discordjs/voice')
const DISCORD_MSG_LIMIT = 2000;
const discordClient = new Discord.Client()
const discordClient = new Discord.Client({
intents: [
Discord.Intents.FLAGS.GUILDS,
Discord.Intents.FLAGS.GUILD_MESSAGES,
Discord.Intents.FLAGS.GUILD_MEMBERS,
Discord.Intents.FLAGS.GUILD_VOICE_STATES
],
});
if (process.env.DEBUG)
discordClient.on('debug', console.debug);
discordClient.on('ready', () => {
Expand All @@ -173,12 +181,12 @@ const _CMD_LANG = PREFIX + 'lang';
const guildMap = new Map();


discordClient.on('message', async (msg) => {
discordClient.on('messageCreate', async (msg) => {
try {
if (!('guild' in msg) || !msg.guild) return; // prevent private messages to bot
const mapKey = msg.guild.id;
if (msg.content.trim().toLowerCase() == _CMD_JOIN) {
if (!msg.member.voice.channelID) {
if (!msg.member.voice.channelId) {
msg.reply('Error: please join a voice channel first.')
} else {
if (!guildMap.has(mapKey))
Expand All @@ -189,8 +197,7 @@ discordClient.on('message', async (msg) => {
} else if (msg.content.trim().toLowerCase() == _CMD_LEAVE) {
if (guildMap.has(mapKey)) {
let val = guildMap.get(mapKey);
if (val.voice_Channel) val.voice_Channel.leave()
if (val.voice_Connection) val.voice_Connection.disconnect()
if (val.voice_Connection) val.voice_Connection.destroy()
guildMap.delete(mapKey)
msg.reply("Disconnected.")
} else {
Expand Down Expand Up @@ -260,21 +267,23 @@ class Silence extends Readable {

async function connect(msg, mapKey) {
try {
let voice_Channel = await discordClient.channels.fetch(msg.member.voice.channelID);
if (!voice_Channel) return msg.reply("Error: The voice channel does not exist!");
let text_Channel = await discordClient.channels.fetch(msg.channel.id);
if (!text_Channel) return msg.reply("Error: The text channel does not exist!");
let voice_Connection = await voice_Channel.join();
voice_Connection.play(new Silence(), { type: 'opus' });
let voice_Connection = DiscoidVoice.joinVoiceChannel({
adapterCreator: msg.guild.voiceAdapterCreator,
channelId: msg.member.voice.channelId,
guildId: msg.guild.id,
selfDeaf: false,
});
await DiscoidVoice.entersState(voice_Connection, DiscoidVoice.VoiceConnectionStatus.Ready, 20e3);
guildMap.set(mapKey, {
'text_Channel': text_Channel,
'voice_Channel': voice_Channel,
'voice_Connection': voice_Connection,
'selected_lang': 'en',
'debug': false,
});
speak_impl(voice_Connection, mapKey)
voice_Connection.on('disconnect', async(e) => {
speak_impl(voice_Connection.receiver, mapKey)
voice_Connection.on(DiscoidVoice.VoiceConnectionStatus.Disconnected, async(e) => {
if (e) console.log(e);
guildMap.delete(mapKey);
})
Expand All @@ -300,23 +309,31 @@ if (SPEECH_METHOD === 'vosk') {
// dev reference: https://github.com/alphacep/vosk-api/blob/master/nodejs/index.js
}


function speak_impl(voice_Connection, mapKey) {
voice_Connection.on('speaking', async (user, speaking) => {
if (speaking.bitfield == 0 || user.bot) {
const prism = require('prism-media');
function speak_impl(receiver, mapKey) {
receiver.speaking.on('start', async (userId) => {
let user = await discordClient.users.fetch(userId);
if (user.bot) {
return
}
console.log(`I'm listening to ${user.username}`)
// this creates a 16-bit signed PCM, stereo 48KHz stream
const audioStream = voice_Connection.receiver.createStream(user, { mode: 'pcm' })
audioStream.on('error', (e) => {
const audioStream = receiver.subscribe(userId, {
end: {
behavior: DiscoidVoice.EndBehaviorType.AfterSilence,
duration: 100,
},
});
const decodedAudioStream = new prism.opus.Decoder({ channels: 2, rate: 48000, frameSize: 960 });
audioStream.pipe(decodedAudioStream);
decodedAudioStream.on('error', (e) => {
console.log('audioStream: ' + e)
});
let buffer = [];
audioStream.on('data', (data) => {
decodedAudioStream.on('data', (data) => {
buffer.push(data)
})
audioStream.on('end', async () => {
decodedAudioStream.on('end', async () => {
buffer = Buffer.concat(buffer)
const duration = buffer.length / 48000 / 4;
console.log("duration: " + duration)
Expand Down
Loading