Revert to Naudiodon and Update Config

- Changed to .env file

Client/.env

@@ -1 +1,8 @@
-DEBUG="client:*";
+DEBUG="client:*"
+TOKEN=""
+# Bot Config
+APPLICATION_ID=""
+GUILD_ID=""
+# Audio Config
+AUDIO_DEVICE_ID="1"
+AUDIO_DEVICE_NAME="VoiceMeeter VAIO3 Output (VB-Au"

Client/config/botConfig.json

@@ -1,6 +0,0 @@
-{  
-  "ApplicationID": "943742040255115304",
-  "GuildID": "367396189529833472",
-  "DeviceID": "1",
-  "DeviceName": "VoiceMeeter VAIO3 Output (VB-Au"
-}

Client/controllers/audioController.js

@@ -1,12 +1,12 @@
 // Config
 const { getDeviceID } = require('../utilities/configHandler.js');
 // Modules
-const alsaInstance = require('alsa-capture');
+const portAudio = require('naudiodon');
 const { returnAlsaDeviceObject } = require("../utilities/executeConsoleCommands.js");
 // Debug
 const { DebugBuilder } = require("../utilities/debugBuilder.js");
 // Global Vars
-const log = new DebugBuilder("client-bot", "audioController");
+const log = new DebugBuilder("client", "audioController");
 
 /**
  * Checks to make sure the selected audio device is available and returns the device object (PortAudio Device Info)
@@ -19,8 +19,13 @@ const log = new DebugBuilder("client-bot", "audioController");
 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);
+    let confirmedDevice;
-    if (deviceName) return deviceList.find(device => device.name === deviceName);
+    if (deviceId) confirmedDevice = deviceList.find(device => device.id === deviceId);
+    if (deviceName) confirmedDevice = deviceList.find(device => device.name === deviceName);
+
+    log.DEBUG("Confirmed Audio Device: ", confirmedDevice);
+
+    return confirmedDevice;
 }
 exports.confirmAudioDevice = confirmAudioDevice;
 
@@ -31,9 +36,16 @@ exports.confirmAudioDevice = confirmAudioDevice;
  */
 async function getAudioDevices(){
     // Exec output contains both stderr and stdout outputs    
-    const deviceList = await returnAlsaDeviceObject();
+    //const deviceList = await returnAlsaDeviceObject();
-    log.DEBUG("Device list: ", deviceList);
+    const deviceList = portAudio.getDevices().map((device) => {
-
+        if (device.maxInputChannels > 2) {
+            return device;
+        }
+        else {
+            return null;
+        }
+    }).filter(Boolean);
+    log.VERBOSE("Device List: ", deviceList);
     return deviceList;
 }
 exports.getAudioDevices = getAudioDevices;
@@ -48,6 +60,19 @@ 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 portAudio.AudioIO({ 
+        inOptions: {		        
+            channelCount: 2,		        
+            sampleFormat: portAudio.SampleFormat16Bit,		        
+            sampleRate: 48000,		        
+            deviceId: selectedDevice.id, // Use -1 or omit the deviceId to select the default device
+            closeOnError: true, // Close the stream if an audio error is detected, if set false then just log the error
+            framesPerBuffer: 20, //(48000 / 1000) * 20, //(48000 * 16 * 2) / 1000 * 20 // (48000 * (16 / 8) * 2) / 60 / 1000 * 20  //0.025 * 48000 / 2
+            highwaterMark: 3840,
+        },		
+    });
+/*
     return new alsaInstance({        
         channels: 2,
         format: "U8",
@@ -57,5 +82,7 @@ async function createAudioInstance() {
         periodTime: undefined,
 //        highwaterMark: 3840
     });
+*/
+
 }
 exports.createAudioInstance = createAudioInstance;

Client/package.json

@@ -3,6 +3,11 @@
   "version": "0.0.0",
   "private": true,
   "main": "app.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "preinstall": "echo preinstall",
+    "postinstall": "echo postinstall"
+  },
   "dependencies": {
     "convert-units": "^2.3.4",
     "cookie-parser": "~1.4.4",
@@ -21,6 +26,6 @@
     "discord.js": "^14.7.1",
     "node-gyp": "^9.3.0",
     "libsodium-wrappers": "^0.7.10",
-    "alsa-capture": "0.3.0"
+    "naudiodon": "^2.3.6"
   }
 }

Client/setup.sh

@@ -1,10 +1,26 @@
 #!/bin/bash
 
+# Check if the user is root
+if [ "$EUID" -ne 0 ]
+  then echo "Please run as root"
+  exit
+fi
+
+# Check for updates
+apt-get update
+
+# Install Node Repo
+curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash -
+
+# Update the system
 apt-get update
 apt-get upgrade -y
 
+# Install the necessary packages
 apt-get install -y nodejs npm libopus-dev gcc make alsa-utils libasound2 libasound2-dev libpulse-dev pulseaudio apulse
 
+# Ensure pulse audio is running
 pulseaudio
 
+# Install the node packages from the project
 npm i 

Client/utilities/configHandler.js

@@ -4,45 +4,33 @@ const log = new DebugBuilder("client", "configController");
 // Modules
 const { readFileSync } = require('fs');
 const path = require("path");
+require('dotenv').config();
 
-function getConfig() {
+const GuildID = process.env.GUILD_ID;
-    const botConfigObj = JSON.parse(readFileSync(path.resolve("./config/botConfig.json")))
+const ApplicationID = process.env.APPLICATION_ID;
-    return botConfigObj;
+const DeviceID = parseInt(process.env.AUDIO_DEVICE_ID);
-}
+const DeviceName = process.env.AUDIO_DEVICE_NAME;
-exports.getConfig = getConfig;
 
 function getGuildID() {
-    const parsedJSON = getConfig();
+    log.DEBUG("Guild ID: ", GuildID);
-    const guildID = parsedJSON.GuildID;
+    return GuildID;
-
-    log.DEBUG("Guild ID: ", guildID);
-    return guildID;
 }
 exports.getGuildID = getGuildID;
 
 function getApplicationID() {
-    const parsedJSON = getConfig();
+    log.DEBUG("Application ID: ", ApplicationID);
-    const appID = parsedJSON.ApplicationID;
+    return ApplicationID;
-
-    log.DEBUG("Application ID: ", appID);
-    return appID;
 }
 exports.getApplicationID = getApplicationID;
 
 function getDeviceID(){
-    const parsedJSON = getConfig();
+    log.DEBUG("Device ID: ", DeviceID);
-    const deviceID = parseInt(parsedJSON.DeviceID);
+    return DeviceID;
-
-    log.DEBUG("Device ID: ", deviceID);
-    return deviceID;
 }
 exports.getDeviceID = getDeviceID;
 
 function getDeviceName(){
-    const parsedJSON = getConfig();
+    log.DEBUG("Device Name: ", DeviceName);
-    const deviceName = parsedJSON.DeviceName;
+    return DeviceName;
-
-    log.DEBUG("Device Name: ", deviceName);
-    return deviceName;
 }
 exports.getDeviceName = getDeviceID;