Fix wrong audio stream, improve debugging (#69)

package.json

@@ -64,7 +64,7 @@
     "wav": "^1.0.2",
     "yargs-parser": "^20.0.0",
     "youtube-search": "^1.1.4",
-    "ytdl-core": "^4.2.1",
+    "ytdl-core": "^4.4.5",
     "ytpl": "^2.0.3",
     "ytsr": "^3.0.0",
     "zlib-sync": "^0.1.7"

src/GlobalContext.ts

@@ -5,6 +5,7 @@ import {Config} from './guild/Config';
 import {FileUtils} from './utils/FileUtils';
 import {DefaultConfig} from './guild/DefaultConfig';
 import {Directory} from './Directory';
+import {Utils} from './utils/Utils';
 
 const guildContexts: Map<string, GuildContext> = new Map();
 const client = new Client();
@@ -43,9 +44,11 @@ export namespace GlobalContext {
 
     export function getMemoryUsage(): number[] {
         return [
+            process.memoryUsage().heapUsed / 1000000,
             process.memoryUsage().heapTotal / 1000000,
             process.memoryUsage().external / 1000000,
             process.memoryUsage().rss / 1000000,
+            process.memoryUsage().arrayBuffers,
         ];
     }
 
@@ -59,4 +62,8 @@ export namespace GlobalContext {
         }
         return version;
     }
+
+    export function getUptime(): string {
+        return Utils.convertSecondsToTimeString(process.uptime());
+    }
 }

src/commands/debug/Status.ts

@@ -85,16 +85,19 @@ function getStatusResponse(context: GuildContext): string {
             tableData3.push([GuildUtils.parseUserFromUserID(context, userID)!.username]);
         });
     response += `${TableGenerator.createTable(tableHeader3, tableData3)}\n`;
-    response += `Version: ${GlobalContext.getBotVersion()}`;
+    response += `Version: ${GlobalContext.getBotVersion()}\n`;
+    response += `Uptime: ${GlobalContext.getUptime()}`;
     return response;
 }
 
 function getMemoryResponse(): string {
     const tableHeaders = ['Type', 'Allocated (MBs)'];
     const tableData: string[][] = [];
     const memory = GlobalContext.getMemoryUsage();
-    tableData.push(['heapTotal', memory[0].toString()]);
-    tableData.push(['external', memory[1].toString()]);
-    tableData.push(['rss', memory[2].toString()]);
+    tableData.push(['heapUsed', memory[0].toString()]);
+    tableData.push(['heapTotal', memory[1].toString()]);
+    tableData.push(['external', memory[2].toString()]);
+    tableData.push(['rss', memory[3].toString()]);
+    tableData.push(['arrayBuffers', memory[4].toString()]);
     return TableGenerator.createTable(tableHeaders, tableData);
 }

src/voice/ConnectionHandler.ts

@@ -9,6 +9,7 @@ import {CachingStream} from '../utils/CachingStream';
 import SilenceInsertionHandler from './SilenceInsertionHandler';
 import SilenceDetectingStream from '../utils/SilenceDetectingStream';
 import {AudioUtils} from '../utils/AudioUtils';
+import { Transform } from 'stream';
 
 const USER_REJOIN_THRESHOLD = 15000;
 const NO_USER_TIMEOUT = 60 * 1000;
@@ -24,6 +25,7 @@ export default class VoiceConnectionHandler {
     private readonly isListeningToCommand: Map<string, boolean> = new Map();
     private noUsersInVoiceChannelTimeout: NodeJS.Timeout | undefined;
     private userJoinedFromBrowser: Set<string> = new Set();
+    private readonly opusDecoderStreamReferences: Map<string, Transform> = new Map();
 
     private readonly silenceInsertionHandler = new SilenceInsertionHandler(this.voiceStreams);
     private readonly mergeStream: MergingStream = new MergingStream(this.voiceStreams);
@@ -177,6 +179,8 @@ export default class VoiceConnectionHandler {
         const timeout = setTimeout(() => {
             Logger.i(VoiceConnectionHandler.name, `Removing ${user.tag} [${user.id}]`, this.context);
             this.voiceStreams.delete(user.id);
+            this.opusDecoderStreamReferences.get(user.id)?.destroy();
+            this.opusDecoderStreamReferences.delete(user.id);
             this.removedTimeouts.delete(user.id);
         }, USER_REJOIN_THRESHOLD);
         this.removedTimeouts.set(user.id, timeout);
@@ -197,9 +201,11 @@ export default class VoiceConnectionHandler {
             console.log(`Error when decoding stream, unable to listen to ${user.tag}, Error: ${err}`);
             opusStream.removeAllListeners();
             opusStream.destroy();
+            decodedAudioStream.destroy();
             this.userJoinedFromBrowser.add(user.id);
             return;
         });
+        this.opusDecoderStreamReferences.set(user.id, decodedAudioStream);
 
         // Currently Broken, Need to manually decode in order to catch exception
         // const audio = connection.receiver.createStream(user, {
@@ -208,7 +214,7 @@ export default class VoiceConnectionHandler {
         // });
         const previousStream = this.voiceStreams.get(user.id);
         const recorderStream = previousStream || new RecordingStream(true);
-        opusStream.pipe(recorderStream, {end: false});
+        decodedAudioStream.pipe(recorderStream, {end: false});
         this.voiceStreams.set(user.id, recorderStream);
         const speechRecognizer = this.context.getVoiceDependencyProvider().getSpeechRecognizer();
         const hotwordEngine = this.context.getVoiceDependencyProvider().getHotwordEngine();