u2a 3.5.2 → 3.5.3

package/src/utils/securexec.js

@@ -1,13 +1,13 @@
-const { execSync } = require('child_process');
-const { sanitizeCommand } = require('./sanitize');
-
-function secureExec(command, options = {}) {
-    const sanitizedCommand = sanitizeCommand(command);
-    const result = execSync(sanitizedCommand, options);
-
-    return result;
-  }
-  
-module.exports = {
-    secureExec
+const { execSync } = require('child_process');
+const { sanitizeCommand } = require('./sanitize');
+
+function secureExec(command, options = {}) {
+    const sanitizedCommand = sanitizeCommand(command);
+    const result = execSync(sanitizedCommand, options);
+
+    return result;
+  }
+  
+module.exports = {
+    secureExec
 }

package/src/utils/settings.js

@@ -1,111 +1,113 @@
-const fs = require('fs');
-const { SETTINGS_PATH } = require('./config');
-const Logger = require('./logger');
-
-const logger = new Logger('settings');
-
-const DEFAULT_SETTINGS = {
-    send_anon_reports: true,
-    version_check: true
-};
-
-// reset is DANGEROUS ! resets all settings
-function initSettings(reset = false) {
-    try {
-        let currentSettings = {};
-
-        if (!reset && fs.existsSync(SETTINGS_PATH)) {
-            try {
-                currentSettings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
-                logger.debug('Existing settings loaded');
-            } catch (err) {
-                logger.debug(`Error reading existing settings.json, will reinitialize`, err.message);
-                currentSettings = {};
-            }
-        }
-
-        if (reset) {
-            logger.debug('Resetting all settings to default values');
-            fs.writeFileSync(SETTINGS_PATH, JSON.stringify({ ...DEFAULT_SETTINGS }, null, 2));
-            return { ...DEFAULT_SETTINGS };
-        }
-
-        const mergedSettings = {};
-
-        Object.keys(DEFAULT_SETTINGS).forEach(key => {
-            mergedSettings[key] = currentSettings[key] !== undefined
-                ? currentSettings[key]
-                : DEFAULT_SETTINGS[key];
-        });
-
-        Object.keys(currentSettings).forEach(key => {
-            if (mergedSettings[key] === undefined) {
-                mergedSettings[key] = currentSettings[key];
-            }
-        });
-
-        fs.writeFileSync(SETTINGS_PATH, JSON.stringify(mergedSettings, null, 2));
-        logger.debug('Settings initialized successfully');
-
-        return mergedSettings;
-    } catch (err) {
-        logger.debug(`Error initializing settings.json`, err.message);
-        return { ...DEFAULT_SETTINGS };
-    }
-}
-
-function getSettings() {
-    try {
-        if (fs.existsSync(SETTINGS_PATH)) {
-            return JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
-        }
-        return {};
-    } catch (err) {
-        logger.debug(`Error reading settings.json`, err.message);
-        return {};
-    }
-}
-
-
-function saveSettings(settings) {
-    try {
-        fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
-        logger.debug('Settings saved successfully');
-    } catch (err) {
-        logger.debug(`Error writing settings.json`, err.message);
-    }
-}
-
-
-function getSetting(key, defaultValue = null) {
-    const settings = getSettings();
-    return settings[key] !== undefined ? settings[key] : defaultValue;
-}
-//use : setSetting('version_check', true);
-function setSetting(key, value) {
-    const settings = getSettings();
-    settings[key] = value;
-    saveSettings(settings);
-}
-
-function resetSetting(key) {
-    if (!(key in DEFAULT_SETTINGS)) {
-        logger.debug(`resetSetting: "${key}" is not a valid default setting key`);
-        return;
-    }
-
-    const settings = getSettings();
-    settings[key] = DEFAULT_SETTINGS[key];
-    saveSettings(settings);
-    logger.debug(`Setting "${key}" reset to default value`);
-}
-
-
-module.exports = {
-    initSettings,
-    getSettings,
-    saveSettings,
-    getSetting,
-    setSetting,
-    resetSetting
+const fs = require('fs');
+const { SETTINGS_PATH } = require('./config');
+const Logger = require('./logger');
+
+const logger = new Logger('settings');
+
+const DEFAULT_SETTINGS = {
+    send_anon_reports: true,
+    version_check: true,
+    always_show_debug: false,
+
+};
+
+// reset is DANGEROUS ! resets all settings
+function initSettings(reset = false) {
+    try {
+        let currentSettings = {};
+
+        if (!reset && fs.existsSync(SETTINGS_PATH)) {
+            try {
+                currentSettings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
+                logger.debug('Existing settings loaded');
+            } catch (err) {
+                logger.debug(`Error reading existing settings.json, will reinitialize`, err.message);
+                currentSettings = {};
+            }
+        }
+
+        if (reset) {
+            logger.debug('Resetting all settings to default values');
+            fs.writeFileSync(SETTINGS_PATH, JSON.stringify({ ...DEFAULT_SETTINGS }, null, 2));
+            return { ...DEFAULT_SETTINGS };
+        }
+
+        const mergedSettings = {};
+
+        Object.keys(DEFAULT_SETTINGS).forEach(key => {
+            mergedSettings[key] = currentSettings[key] !== undefined
+                ? currentSettings[key]
+                : DEFAULT_SETTINGS[key];
+        });
+
+        Object.keys(currentSettings).forEach(key => {
+            if (mergedSettings[key] === undefined) {
+                mergedSettings[key] = currentSettings[key];
+            }
+        });
+
+        fs.writeFileSync(SETTINGS_PATH, JSON.stringify(mergedSettings, null, 2));
+        logger.debug('Settings initialized successfully');
+
+        return mergedSettings;
+    } catch (err) {
+        logger.debug(`Error initializing settings.json`, err.message);
+        return { ...DEFAULT_SETTINGS };
+    }
+}
+
+function getSettings() {
+    try {
+        if (fs.existsSync(SETTINGS_PATH)) {
+            return JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
+        }
+        return {};
+    } catch (err) {
+        logger.debug(`Error reading settings.json`, err.message);
+        return {};
+    }
+}
+
+
+function saveSettings(settings) {
+    try {
+        fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
+        logger.debug('Settings saved successfully');
+    } catch (err) {
+        logger.debug(`Error writing settings.json`, err.message);
+    }
+}
+
+
+function getSetting(key, defaultValue = null) {
+    const settings = getSettings();
+    return settings[key] !== undefined ? settings[key] : defaultValue;
+}
+//use : setSetting('version_check', true);
+function setSetting(key, value) {
+    const settings = getSettings();
+    settings[key] = value;
+    saveSettings(settings);
+}
+
+function resetSetting(key) {
+    if (!(key in DEFAULT_SETTINGS)) {
+        logger.debug(`resetSetting: "${key}" is not a valid default setting key`);
+        return;
+    }
+
+    const settings = getSettings();
+    settings[key] = DEFAULT_SETTINGS[key];
+    saveSettings(settings);
+    logger.debug(`Setting "${key}" reset to default value`);
+}
+
+
+module.exports = {
+    initSettings,
+    getSettings,
+    saveSettings,
+    getSetting,
+    setSetting,
+    resetSetting
 };

package/src/utils/versionCheck.js

@@ -1,150 +1,150 @@
-const axios = require('axios');
-const { version } = require('../../package.json');
-const Logger = require('./logger');
-const { getSetting } = require('./settings');
-const chalk = require('chalk');
-
-const logger = new Logger('version-check');
-
-// types of updates based on pattern arount lines 90 of this file
-const UPDATE_TYPES = {
-  NONE: 'none',
-  SECURITY: 'security',
-  CORE: 'core',
-  FEATURE: 'feature'
-};
-
-async function checkVersion(silent = false, forceCheck = false) {
-  //check if version check is enabled in settings
-  const versionCheckEnabled = getSetting('version_check');
-
-  //if version check is disabled and not forcing skip the check (btw idk why i made forcecheck)
-  if (!versionCheckEnabled && !forceCheck) {
-    logger.debug('Version check is disabled in settings');
-    return {
-      current: version,
-      latest: null,
-      needsUpdate: false,
-      updateType: UPDATE_TYPES.NONE,
-      skipped: true,
-      reason: 'version_check disabled in settings'
-    };
-  }
-
-  try {
-    logger.debug('Started version check');
-    const response = await axios.get('https://urltoapp.xyz/api/v1/getlastest', {
-      timeout: 1000
-    });
-
-    const latestVersion = response.data.trim();
-    logger.debug(`Version retrieved: ${latestVersion}`);
-
-    const versionComparison = compareVersions(version, latestVersion);
-    const updateType = getUpdateType(version, latestVersion);
-    const needsUpdate = versionComparison < 0;
-
-    if (!silent && needsUpdate) {
-      logger.debug(`New update available: ${latestVersion} (${updateType})`);
-      console.log('');
-
-      const updateMessages = {
-        [UPDATE_TYPES.SECURITY]: `CRITICAL: Security update (${latestVersion}) available!`,
-        [UPDATE_TYPES.CORE]: `IMPORTANT: Core update (${latestVersion}) available!`,
-        [UPDATE_TYPES.FEATURE]: `NEW: Feature update (${latestVersion}) available!`
-      };
-
-      if (updateType === UPDATE_TYPES.SECURITY) {
-        logger.error(updateMessages[UPDATE_TYPES.SECURITY]); //using .error cuz im lazy to do other variations, sorry ! :)
-      } else {
-        logger.warn(updateMessages[updateType] || `A new update (${latestVersion}) is available!`);
-      }
-
-      logger.warn(`Current version: ${version}`);
-      logger.warn(`Update u2a with: ${chalk.underline(`npm install -g u2a@${latestVersion}`)}`);
-
-      if (updateType === UPDATE_TYPES.SECURITY) {
-        logger.error('This update fixes SECURITY VULNERABILITIES and should be installed immediately!');
-      }
-    }
-
-    return {
-      current: version,
-      latest: latestVersion,
-      needsUpdate,
-      updateType,
-      updateDetails: needsUpdate ? getUpdateDetails(version, latestVersion) : null,
-      skipped: false
-    };
-  } catch (error) {
-    logger.debug(`Version check failed: ${error.message}`);
-    return {
-      current: version,
-      latest: null,
-      needsUpdate: false,
-      updateType: UPDATE_TYPES.NONE,
-      error: error.message,
-      skipped: false
-    };
-  }
-}
-
-function compareVersions(v1, v2) {
-  const parts1 = v1.split('.').map(Number);
-  const parts2 = v2.split('.').map(Number);
-
-  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
-    const part1 = parts1[i] || 0;
-    const part2 = parts2[i] || 0;
-
-    if (part1 < part2) return -1;
-    if (part1 > part2) return 1;
-  }
-
-  return 0;
-}
-
-function getUpdateType(currentVersion, latestVersion) {
-  if (currentVersion === latestVersion) {
-    return UPDATE_TYPES.NONE;
-  }
-
-  const current = currentVersion.split('.').map(Number);
-  const latest = latestVersion.split('.').map(Number);
-
-  /*
-    a.b.c format where:
-    a: security version
-    b: core version
-    c: feature version
-    eg, 3.4.18 -> security version: 3, core version: 4, feature version: 18
-  */
-
-  if (latest[0] > current[0]) {
-    return UPDATE_TYPES.SECURITY;
-  } else if (latest[1] > current[1]) {
-    return UPDATE_TYPES.CORE;
-  } else if (latest[2] > current[2]) {
-    return UPDATE_TYPES.FEATURE;
-  }
-
-  return UPDATE_TYPES.NONE; //current is newer or same
-}
-
-function getUpdateDetails(currentVersion, latestVersion) {
-  const current = currentVersion.split('.').map(Number);
-  const latest = latestVersion.split('.').map(Number);
-
-  return {
-    securityChanges: latest[0] - current[0],
-    coreChanges: latest[1] - current[1],
-    featureChanges: latest[2] - current[2],
-    fromVersion: currentVersion,
-    toVersion: latestVersion
-  }; //hard maths up here
-}
-
-module.exports = {
-  checkVersion,
-  UPDATE_TYPES
+const axios = require('axios');
+const { version } = require('../../package.json');
+const Logger = require('./logger');
+const { getSetting } = require('./settings');
+const chalk = require('chalk');
+
+const logger = new Logger('version-check');
+
+// types of updates based on pattern arount lines 90 of this file
+const UPDATE_TYPES = {
+  NONE: 'none',
+  SECURITY: 'security',
+  CORE: 'core',
+  FEATURE: 'feature'
+};
+
+async function checkVersion(silent = false, forceCheck = false) {
+  //check if version check is enabled in settings
+  const versionCheckEnabled = getSetting('version_check');
+
+  //if version check is disabled and not forcing skip the check (btw idk why i made forcecheck)
+  if (!versionCheckEnabled && !forceCheck) {
+    logger.debug('Version check is disabled in settings');
+    return {
+      current: version,
+      latest: null,
+      needsUpdate: false,
+      updateType: UPDATE_TYPES.NONE,
+      skipped: true,
+      reason: 'version_check disabled in settings'
+    };
+  }
+
+  try {
+    logger.debug('Started version check');
+    const response = await axios.get('https://urltoapp.xyz/api/v1/getlastest', {
+      timeout: 1000
+    });
+
+    const latestVersion = response.data.trim();
+    logger.debug(`Version retrieved: ${latestVersion}`);
+
+    const versionComparison = compareVersions(version, latestVersion);
+    const updateType = getUpdateType(version, latestVersion);
+    const needsUpdate = versionComparison < 0;
+
+    if (!silent && needsUpdate) {
+      logger.debug(`New update available: ${latestVersion} (${updateType})`);
+      console.log('');
+
+      const updateMessages = {
+        [UPDATE_TYPES.SECURITY]: `CRITICAL: Security update (${latestVersion}) available!`,
+        [UPDATE_TYPES.CORE]: `IMPORTANT: Core update (${latestVersion}) available!`,
+        [UPDATE_TYPES.FEATURE]: `NEW: Feature update (${latestVersion}) available!`
+      };
+
+      if (updateType === UPDATE_TYPES.SECURITY) {
+        logger.error(updateMessages[UPDATE_TYPES.SECURITY]); //using .error cuz im lazy to do other variations, sorry ! :)
+      } else {
+        logger.warn(updateMessages[updateType] || `A new update (${latestVersion}) is available!`);
+      }
+
+      logger.warn(`Current version: ${version}`);
+      logger.warn(`Update u2a with: ${chalk.underline(`npm install -g u2a@${latestVersion}`)}`);
+
+      if (updateType === UPDATE_TYPES.SECURITY) {
+        logger.error('This update fixes SECURITY VULNERABILITIES and should be installed immediately!');
+      }
+    }
+
+    return {
+      current: version,
+      latest: latestVersion,
+      needsUpdate,
+      updateType,
+      updateDetails: needsUpdate ? getUpdateDetails(version, latestVersion) : null,
+      skipped: false
+    };
+  } catch (error) {
+    logger.debug(`Version check failed: ${error.message}`);
+    return {
+      current: version,
+      latest: null,
+      needsUpdate: false,
+      updateType: UPDATE_TYPES.NONE,
+      error: error.message,
+      skipped: false
+    };
+  }
+}
+
+function compareVersions(v1, v2) {
+  const parts1 = v1.split('.').map(Number);
+  const parts2 = v2.split('.').map(Number);
+
+  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+    const part1 = parts1[i] || 0;
+    const part2 = parts2[i] || 0;
+
+    if (part1 < part2) return -1;
+    if (part1 > part2) return 1;
+  }
+
+  return 0;
+}
+
+function getUpdateType(currentVersion, latestVersion) {
+  if (currentVersion === latestVersion) {
+    return UPDATE_TYPES.NONE;
+  }
+
+  const current = currentVersion.split('.').map(Number);
+  const latest = latestVersion.split('.').map(Number);
+
+  /*
+    a.b.c format where:
+    a: security version
+    b: core version
+    c: feature version
+    eg, 3.4.18 -> security version: 3, core version: 4, feature version: 18
+  */
+
+  if (latest[0] > current[0]) {
+    return UPDATE_TYPES.SECURITY;
+  } else if (latest[1] > current[1]) {
+    return UPDATE_TYPES.CORE;
+  } else if (latest[2] > current[2]) {
+    return UPDATE_TYPES.FEATURE;
+  }
+
+  return UPDATE_TYPES.NONE; //current is newer or same
+}
+
+function getUpdateDetails(currentVersion, latestVersion) {
+  const current = currentVersion.split('.').map(Number);
+  const latest = latestVersion.split('.').map(Number);
+
+  return {
+    securityChanges: latest[0] - current[0],
+    coreChanges: latest[1] - current[1],
+    featureChanges: latest[2] - current[2],
+    fromVersion: currentVersion,
+    toVersion: latestVersion
+  }; //hard maths up here
+}
+
+module.exports = {
+  checkVersion,
+  UPDATE_TYPES
 };