From 4a81f0411f4efb828323a9b303a233c46cb86aa7 Mon Sep 17 00:00:00 2001
From: Rim <info@rimmyscorner.com>
Date: Tue, 1 Apr 2025 22:16:53 -0400
Subject: [PATCH] fix(logger.js): properly log user activity and api activity
 separately in node and bundled environments

---
 src/js/logger.js | 69 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/js/logger.js b/src/js/logger.js
index 009e46c..f826a02 100644
--- a/src/js/logger.js
+++ b/src/js/logger.js
@@ -3,32 +3,51 @@ const fs = require('fs');
 const path = require('path');
 
 class Logger {
-  constructor(options = {}) {
+constructor(options = {}) {
+    // Dynamically determine the base directory
+    const isPackaged = process.pkg !== undefined;
+    let baseDir;
+    
+    if (isPackaged) {
+        // If running as a packaged executable, use the directory where the executable is located
+        baseDir = path.dirname(process.execPath);
+    } else {
+        // In development, use the project root directory
+        baseDir = process.cwd();
+    }
+    
     this.options = {
-      logToConsole: options.logToConsole !== false,
-      logToFile: options.logToFile || false,
-      logDirectory: options.logDirectory || path.join(__dirname, '..', '..', 'logs'),
-      userActivityLogFile: options.userActivityLogFile || 'user-activity.log',
-      apiLogFile: options.apiLogFile || 'api.log',
-      // Log levels: debug, info, warn, error
-      minLevel: options.minLevel || 'info'
+        logToConsole: options.logToConsole !== false,
+        logToFile: options.logToFile || false,
+        // Use the determined base directory + logs
+        logDirectory: options.logDirectory || path.join(baseDir, 'logs'),
+        userActivityLogFile: options.userActivityLogFile || 'user-activity.log',
+        apiLogFile: options.apiLogFile || 'api.log',
+        minLevel: options.minLevel || 'info'
     };
-
+    
     // Create log directory if it doesn't exist and logging to file is enabled
     if (this.options.logToFile) {
-      if (!fs.existsSync(this.options.logDirectory)) {
-        fs.mkdirSync(this.options.logDirectory, { recursive: true });
-      }
+        try {
+        if (!fs.existsSync(this.options.logDirectory)) {
+            fs.mkdirSync(this.options.logDirectory, { recursive: true });
+        }
+        } catch (err) {
+        console.error(`Failed to create log directory: ${err.message}`);
+        // Fall back to logging in the same directory as the executable if directory creation fails
+        this.options.logDirectory = baseDir;
+        console.log(`Falling back to logging in: ${this.options.logDirectory}`);
+        }
     }
 
     // Log levels and their priorities
     this.levels = {
-      debug: 0,
-      info: 1,
-      warn: 2,
-      error: 3
+        debug: 0,
+        info: 1,
+        warn: 2,
+        error: 3
     };
-  }
+    }
 
   shouldLog(level) {
     return this.levels[level] >= this.levels[this.options.minLevel];
@@ -51,16 +70,20 @@ class Logger {
 
   writeToFile(content, isUserActivity = false) {
     if (!this.options.logToFile) return;
-
+  
     const logFile = isUserActivity 
       ? path.join(this.options.logDirectory, this.options.userActivityLogFile) 
       : path.join(this.options.logDirectory, this.options.apiLogFile);
-
-    fs.appendFile(logFile, content + '\n', (err) => {
-      if (err) {
-        console.error(`Error writing to log file: ${err.message}`);
+  
+    try {
+      fs.appendFileSync(logFile, content + '\n');
+    } catch (err) {
+      console.error(`Error writing to log file: ${err.message}`);
+      // Optionally fall back to console logging if file writing fails
+      if (this.options.logToConsole) {
+        console.error(`Failed to write to log file, logging to console instead: ${content}`);
       }
-    });
+    }
   }
 
   debug(message, data = {}) {