updated relative location for production and dev

package.json

@@ -1,6 +1,6 @@
 {
     "name": "loquendo-bot",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "description": "Bot assistant for streamers over different platforms",
     "main": "src/main.js",
     "scripts": {

src/js/logger.js

@@ -9,8 +9,7 @@ const consoleFormat = format.combine(
     format.colorize(),
     format.timestamp(),
     format.align(),
-	format.printf((info) => `${info.timestamp} - ${info.level}:  ${info.message
+    format.printf((info) => `${info.timestamp} - ${info.level}:  ${info.message} ${JSON.stringify(info.metadata)}`),
-		} ${JSON.stringify(info.metadata)}`),
 );
 
 const fileFormat = format.combine(
@@ -24,11 +23,11 @@ const logger = createLogger({
     format: fileFormat,
     transports: [
         new transports.File({
-			filename: path.join(resourcesPath, '../logs/error.log'),
+            filename: path.join(__dirname, '../logs/error.log'),
             level: 'error',
         }),
         new transports.File({
-			filename: path.join(resourcesPath, '../logs/activity.log'),
+            filename: path.join(__dirname, '../logs/activity.log'),
             maxsize: 5242880,
             maxFiles: 5,
         }),
@@ -44,7 +43,7 @@ if (process.env.NODE_ENV !== 'production') {
     );
 }
 
-fetch(path.join(resourcesPath, '../logs/activity.log'))
+fetch(path.join(__dirname, '../logs/activity.log'))
     .then((response) => response.text())
     .then((logData) => {
         const logLines = logData.trim().split('\n');

src/js/renderer.js

@@ -23,11 +23,11 @@ const settingsPath = main.settingsPath.toString();
 const settings = main.settings;
 
 // TODO: remove gooogle voices txt and use api instead
-const googleVoices = fs.readFileSync(path.join(resourcesPath, './config/googleVoices.txt')).toString().split('\r\n');
+const googleVoices = fs.readFileSync(path.join(__dirname, './config/googleVoices.txt')).toString().split('\r\n');
 // TODO: remove amazon voices txt and use api instead (sakura project has it)
-const amazonVoices = fs.readFileSync(path.join(resourcesPath, './config/amazonVoices.txt')).toString().split('\r\n');
+const amazonVoices = fs.readFileSync(path.join(__dirname, './config/amazonVoices.txt')).toString().split('\r\n');
 
-const languagesObject = fs.readFileSync(path.join(resourcesPath, './config/languages.txt')).toString().split('\r\n');
+const languagesObject = fs.readFileSync(path.join(__dirname, './config/languages.txt')).toString().split('\r\n');
 
 // html elements
 const root = document.documentElement;
@@ -39,17 +39,15 @@ const notificationSound = document.querySelector('#notification'); // obtain the
 const ttsAudioDevices = document.querySelector('#ttsAudioDevice'); // obtain the html reference of the installedTTS comboBox
 
 // laod local javascript files
-const chat = require(path.join(resourcesPath, './js/chat'));
+const chat = require(path.join(__dirname, './js/chat'));
 
-const messageTemplates = require(path.join(resourcesPath, './js/messageTemplates'));
+const messageTemplates = require(path.join(__dirname, './js/messageTemplates'));
-const logger = require(path.join(resourcesPath, './js/logger'));
+const logger = require(path.join(__dirname, './js/logger'));
-const sound = require(path.join(resourcesPath, './js/sound'));
+const sound = require(path.join(__dirname, './js/sound'));
-const talk = require(path.join(resourcesPath, './js/voiceQueue')); // Voice queue system
+const talk = require(path.join(__dirname, './js/voiceQueue')); // Voice queue system
-const config = require(path.join(resourcesPath, './js/settings'));
+const config = require(path.join(__dirname, './js/settings'));
 
-let notificationSounds = path.join(resourcesPath, './sounds/notifications');
+let notificationSounds = path.join(__dirname, './sounds/notifications');
-
-let twitch = require(path.join(resourcesPath, './js/twitch'));
 
 function reset() {
     ipcRenderer.send('restart');
@@ -62,16 +60,17 @@ function setServer() {
     if (!settings.SERVER.USE_SERVER) {
         return;
     }
-    server = require(path.join(resourcesPath, './js/server'));
+    server = require(path.join(__dirname, './js/server'));
     socket = io(`http://localhost:${settings.SERVER.PORT}`); // Connect to your Socket.IO server
 }
 
 setServer();
 
-const Polly = settings.AMAZON.USE_AMAZON ? require(path.join(resourcesPath, './js/amazon')) : '';
+let twitch = settings.TWITCH.USE_TWITCH ? require(path.join(__dirname, './js/twitch')) : '';
-const google = settings.GOOGLE.USE_GOOGLE ? require(path.join(resourcesPath, './js/amazon')) : '';
+const Polly = settings.AMAZON.USE_AMAZON ? require(path.join(__dirname, './js/amazon')) : '';
+const google = settings.GOOGLE.USE_GOOGLE ? require(path.join(__dirname, './js/google')) : '';
 
-const theme = require(path.join(resourcesPath, './js/theme'));
+const theme = require(path.join(__dirname, './js/theme'));
 
 // initialize values
 config.getGeneralSettings();

src/js/server.js

@@ -19,7 +19,7 @@ function startVtuber() {
         return;
     }
 
-    app.use('/vtuber', express.static(path.join(resourcesPath, './modules/vtuber/')));
+    app.use('/vtuber', express.static(path.join(__dirname, '../modules/vtuber/')));
 
     let vtuber = document.body.querySelector('#BrowsersourceVtuber');
     let vtuberframe = document.createElement('iframe');
@@ -37,7 +37,7 @@ function startChatBubble() {
         return;
     }
 
-    app.use('/chat', express.static(path.join(resourcesPath, './modules/chat')));
+    app.use('/chat', express.static(path.join(__dirname, '../modules/chat')));
 
     let chat = document.body.querySelector('#BrowsersourceChat');
     let chatframe = document.createElement('iframe');

src/js/settings.js

@@ -204,6 +204,11 @@ document.body.querySelector('#Info_USERNAME').addEventListener('click', () => {
 
     let element = document.body.querySelector('#TWITCH_OAUTH_TOKEN');
     element.value = key;
+
+    settings.TWITCH.OAUTH_TOKEN = key;
+
+    fs.writeFileSync(settingsPath, ini.stringify(settings));
+    createNotification('Saved OAuth token!', 'success');
 });
 
 document.body.querySelector('#Info_VTUBER').addEventListener('click', () => {
@@ -226,7 +231,7 @@ document.body.querySelector('#close-button').addEventListener('click', (event) =
 
 // #region Notification sound test
 document.body.querySelector('#SoundTestButton').addEventListener('click', () => {
-    sound.playAudio();
+    sound.playNotificationSound();
 });
 
 document.body.querySelector('#TestTwitchCredentials').addEventListener('click', () => {
@@ -248,7 +253,7 @@ document.body.querySelector('#USE_TWITCH').addEventListener('click', () => {
     fs.writeFileSync(settingsPath, ini.stringify(settings));
     const inputs = document.getElementsByClassName('inputTwitch');
     toggleRadio(toggle, inputs);
-    twitch = settings.TWITCH.USE_TWITCH ? require(path.join(resourcesPath, './js/twitch')) : null;
+    twitch = settings.TWITCH.USE_TWITCH ? require(path.join(__dirname, './twitch')) : null;
     createNotification(`${toggle ? 'Enabled' : 'Disabled'} Twitch settings!`, 'success');
 });
 

src/js/sound.js

@@ -47,19 +47,21 @@ function add(ttsData) {
     }
 }
 
-// Play sound function
+function playNotificationSound() {
-function playAudio(data) {
     if (settings.AUDIO.USE_NOTIFICATION_SOUNDS) {
         let notfication = new Audio(
-            path.join(resourcesPath, `../src/sounds/notifications/${notificationSound.options[settings.AUDIO.NOTIFICATION_SOUND].text}`),
+            path.join(resourcesPath, `./sounds/notifications/${notificationSound.options[settings.AUDIO.NOTIFICATION_SOUND].text}`),
         );
         notfication.volume = settings.AUDIO.NOTIFICATION_VOLUME / 100;
         notfication.play();
     }
+}
 
+// Play sound function
+function playAudio(data) {
     if (settings.TTS.USE_TTS) {
         add(data);
-    } else if (settings.SERVER.USE_SERVER) {
+    } else if (settings.SERVER.USE_SERVER && settings.SERVER.USE_CHATBUBBLE) {
         socket.emit('xxx', currentLogoUrl, currentUsername, data);
     }
 }
@@ -86,8 +88,8 @@ function playVoice(filteredMessage, logoUrl, username, message) {
     if (settings.TTS.USE_TTS) {
         talk.add(textObject, voice);
     } else {
-        playAudio(textObject);
+        playNotificationSound();
     }
 }
 
-module.exports = { playAudio, playVoice };
+module.exports = { playAudio, playVoice, playNotificationSound };

src/js/twitch.js

@@ -29,13 +29,10 @@ function ping(element) {
     client
         .ping()
         .then((data) => {
-            console.log(client.readyState());
-            console.log(data);
             value.classList.add('success');
             value.innerText = 'Success!';
         })
         .catch((e) => {
-            console.log(e);
             value.classList.add('error');
             value.innerText = 'Failed!';
         });

src/js/voiceQueue.js

@@ -6,13 +6,14 @@ const speak = (textObject) =>
     new Promise((resolve) => {
         // say.setEncoding(Encoding);
         counter += 1;
-        let savePath = path.join(resourcesPath, '../src/sounds/tts/internal_audio_' + counter + '.mp3');
+        let savePath = path.join(resourcesPath, './sounds/tts/internal_audio_' + counter + '.mp3');
 
         say.export(textObject.filtered, SelectedVoice, 1, savePath, (err) => {
             if (err) {
                 console.error(err);
             } else {
                 sound.playAudio({ path: savePath, message: textObject });
+                sound.playNotificationSound();
             }
             resolve('finished');
         });

src/main.js

@@ -1,19 +1,21 @@
 const { app, shell, BrowserWindow, ipcMain } = require('electron');
-const writeIniFile = require('write-ini-file');
+const { writeIniFile } = require('write-ini-file');
 const path = require('path');
 
 const ini = require('ini');
 const fs = require('fs');
 
-let resourcesPath;
+let resourcesPath = __dirname;
 let settingsPath;
+
 let settings;
 let window;
 
 if (app.isPackaged) {
+    settingsPath = path.join(process.resourcesPath, './settings.ini');
     resourcesPath = process.resourcesPath;
 } else {
-    resourcesPath = __dirname;
+    settingsPath = path.join(resourcesPath, './config/settings.ini');
 }
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
@@ -22,15 +24,15 @@ if (require('electron-squirrel-startup')) {
 }
 
 async function createWindow() {
-    if (!fs.existsSync(resourcesPath)) {
+    if (!fs.existsSync(settingsPath)) {
-        await createIniFile(path.join(resourcesPath, '../config/settings.ini'));
+        console.log(resourcesPath);
+        await createIniFile();
     } else {
-        settingsPath = path.join(resourcesPath, './config/settings.ini');
         settings = ini.parse(fs.readFileSync(settingsPath, 'utf-8'));
     }
 
     window = new BrowserWindow({
-        icon: path.join(resourcesPath, '/images/icon.png'),
+        icon: path.join(__dirname, '/images/icon.png'),
         width: parseInt(settings.SETTINGS.WIDTH),
         height: parseInt(settings.SETTINGS.HEIGHT),
         x: parseInt(settings.SETTINGS.POSITION_X),
@@ -44,7 +46,7 @@ async function createWindow() {
     });
     window.loadURL('https://github.com');
 
-    window.loadFile(path.join(resourcesPath, 'index.html'));
+    window.loadFile(path.join(__dirname, 'index.html'));
 
     if (!app.isPackaged) {
         window.webContents.openDevTools();
@@ -112,7 +114,7 @@ ipcMain.on('restart', (event) => {
 });
 
 ipcMain.on('environment', (event) => {
-    event.returnValue = { resourcesPath: resourcesPath, settingsPath: settingsPath, settings: settings };
+    event.returnValue = { resourcesPath: resourcesPath, settingsPath: settingsPath, settings: settings, isPackaged: app.isPackaged };
 });
 
 let twitchAuthentication = () =>
@@ -203,7 +205,7 @@ ipcMain.on('chatBubble', async (event) => {
 });
 
 async function createIniFile() {
-    await writeIniFile(resourcesPath, {
+    await writeIniFile(settingsPath, {
         SETTINGS: {
             VOICE_ENABLED: true,
             NOTIFICATION_ENABLED: true,
@@ -268,6 +270,6 @@ async function createIniFile() {
             API_KEY: '',
         },
     }).then(() => {
-        settings = ini.parse(fs.readFileSync(resourcesPath, 'utf-8'));
+        settings = ini.parse(fs.readFileSync(settingsPath, 'utf-8'));
     });
 }