From f995cd3578a52a0f59e3f9aa9f235bdd00b73198 Mon Sep 17 00:00:00 2001
From: Logan Cusano <Logan@simplestepsolutions.com>
Date: Sun, 26 Mar 2023 20:32:21 -0400
Subject: [PATCH] Fixing imports and resolutions

---
 Client/controllers/audioController.js | 13 ++++++++-----
 Client/utilities/configHandler.js     |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Client/controllers/audioController.js b/Client/controllers/audioController.js
index b93da11..cc57a73 100644
--- a/Client/controllers/audioController.js
+++ b/Client/controllers/audioController.js
@@ -16,25 +16,27 @@ const log = new DebugBuilder("client-bot", "audioController");
  * @param deviceId The ID of the device being queried
  * @returns {unknown}
  */
-exports.confirmAudioDevice = async function confirmAudioDevice({deviceName = undefined, deviceId = undefined}){
+async function confirmAudioDevice({deviceName = undefined, deviceId = undefined}){
     const deviceList = await getAudioDevices();
     if (!deviceName && !deviceId) throw new Error("No device given");
     if (deviceId) return deviceList.find(device => device.id === deviceId);
     if (deviceName) return deviceList.find(device => device.name === deviceName);
 }
+exports.confirmAudioDevice = confirmAudioDevice;
 
 /**
  * Return a list of the audio devices connected with input channels
  *
  * @returns {unknown[]}
  */
-exports.getAudioDevices = async function getAudioDevices(){
+async function getAudioDevices(){
     // Exec output contains both stderr and stdout outputs    
     const deviceList = await returnAlsaDeviceObject();
     log.DEBUG("Device list: ", deviceList);
 
     return deviceList;
 }
+exports.getAudioDevices = getAudioDevices;
 
 /**
  * Create and return the audio instance from the saved settings
@@ -42,8 +44,8 @@ exports.getAudioDevices = async function getAudioDevices(){
  *
  * @returns new portAudio.AudioIO
  */
-exports.createAudioInstance = async function createAudioInstance() {
-    const selectedDevice = await this.confirmAudioDevice({deviceId: getDeviceID()});//{deviceName: "VoiceMeeter VAIO3 Output (VB-Au"});
+async function createAudioInstance() {
+    const selectedDevice = await confirmAudioDevice({deviceId: getDeviceID()});//{deviceName: "VoiceMeeter VAIO3 Output (VB-Au"});
     log.DEBUG("Device selected from config: ", selectedDevice);
     // Create an instance of AudioIO with outOptions (defaults are as below), which will return a WritableStream
     return new alsaInstance({        
@@ -55,4 +57,5 @@ exports.createAudioInstance = async function createAudioInstance() {
         periodTime: undefined,
 //        highwaterMark: 3840
     });
-}
\ No newline at end of file
+}
+exports.createAudioInstance = createAudioInstance;
\ No newline at end of file
diff --git a/Client/utilities/configHandler.js b/Client/utilities/configHandler.js
index 144c23a..ba687c8 100644
--- a/Client/utilities/configHandler.js
+++ b/Client/utilities/configHandler.js
@@ -6,7 +6,8 @@ const { readFileSync } = require('fs');
 const path = require("path");
 
 function getConfig() {
-    return JSON.parse(readFileSync(path.resolve("../config/botConfig.json")));
+    const botConfigObj = JSON.parse(readFileSync(path.resolve("./config/botConfig.json")))
+    return botConfigObj;
 }
 exports.getConfig = getConfig;