u2a 3.5.5 → 3.5.7

package/src/utils/upgradeLA.js

@@ -1,141 +1,141 @@
-//seems still a bit unstable, thats why this feature is disabled by default
-//enable with 'u2a configure autoupgrade enable'
-
-
-
-const fs = require('fs');
-const path = require('path');
-const { readDB } = require('./config');
-const Logger = require('./logger');
-const { createApp } = require('../commands/create');
-const { removeApp } = require('../commands/remove');
-const { getSetting } = require('./settings');
-
-const logger = new Logger('upgradeLA');
-
-function isCoreUpdate(currentVersion, newVersion) {
-    try {
-        const [currentSecurity, currentCore, currentFeature] = currentVersion.split('.').map(Number);
-        const [newSecurity, newCore, newFeature] = newVersion.split('.').map(Number);
-
-        return (currentSecurity !== newSecurity || currentCore !== newCore);
-    } catch (err) {
-        logger.debug(`Error comparing versions: ${currentVersion} vs ${newVersion}`, err.message);
-        return false;
-    }
-}
-
-function extractDimensionsFromMainJs(mainJsPath) {
-    try {
-        if (!fs.existsSync(mainJsPath)) {
-            logger.warn(`main.js file not found at ${mainJsPath}`);
-            return { width: 1200, height: 800 };
-        }
-
-        const mainJsContent = fs.readFileSync(mainJsPath, 'utf8');
-
-        const widthMatch = mainJsContent.match(/const\s+WINDOW_WIDTH\s*=\s*(\d+)/);
-        const width = widthMatch ? parseInt(widthMatch[1], 10) : 1200;
-
-        const heightMatch = mainJsContent.match(/const\s+WINDOW_HEIGHT\s*=\s*(\d+)/);
-        const height = heightMatch ? parseInt(heightMatch[1], 10) : 800;
-
-        logger.debug(`Extracted dimensions from main.js: ${width}x${height}`);
-        return { width, height };
-    } catch (err) {
-        logger.debug(`Error extracting dimensions from main.js: ${mainJsPath}`, err.message);
-        return { width: 1200, height: 800 };
-    }
-}
-
-async function upgradeLocalApp(appName, appData) {
-    logger.debug(`Upgrading local app: ${appName}`);
-
-    try {
-        const { url, path: appPath, icon } = appData;
-
-        const mainJsPath = path.join(appPath, 'main.js');
-        const { width, height } = extractDimensionsFromMainJs(mainJsPath);
-
-        const options = {
-            name: appName,
-            width: width,
-            height: height,
-        };
-
-        if (icon)
-            options.icon = icon;
-
-
-        await removeApp(appName, false);
-        logger.debug(`Removed existing app: ${appName}`);
-
-        await createApp(url, options);
-        logger.debug(`Successfully upgraded: ${appName}`);
-
-        return true;
-    } catch (err) {
-        logger.debug(`Failed to upgrade ${appName}`, err.message);
-        return false;
-    }
-}
-
-async function upgradeLocalApps(currentVersion, newVersion) {
-    logger.debug(`Checking for local apps that need upgrading`);
-
-    const autoUpgradeEnabled = getSetting('autoupgrade_localapps');
-    if (!autoUpgradeEnabled) {
-        logger.debug(`Automatic upgrade for local apps is disabled. Skipping upgrades.`);
-        return { skipped: true, reason: 'disabled', upgraded: 0, failed: 0, total: 0 };
-    }
-
-    if (!isCoreUpdate(currentVersion, newVersion)) {
-        logger.debug(`Not a core update (${currentVersion} → ${newVersion}). Skipping local app upgrades.`);
-        return { skipped: true, reason: 'not-core-update', upgraded: 0, failed: 0, total: 0 };
-    }
-
-    try {
-        const db = readDB();
-        const apps = Object.keys(db);
-        const stats = { skipped: false, upgraded: 0, failed: 0, total: apps.length };
-
-        logger.debug(`Found ${apps.length} local apps to check for upgrade`);
-
-        for (const appName of apps) {
-            const appData = db[appName];
-
-            if (!appData.path || !fs.existsSync(appData.path)) { //skips if no path but shouldnt happen
-                logger.debug(`Skipping ${appName}: Not a local app or path doesn't exist`);
-                continue;
-            }
-
-            const success = await upgradeLocalApp(appName, appData);
-            if (success) {
-                stats.upgraded++;
-            } else {
-                stats.failed++;
-            }
-        }
-
-        logger.debug(`Local apps upgrade completed: ${stats.upgraded} upgraded, ${stats.failed} failed, ${apps.length - stats.upgraded - stats.failed} skipped`);
-        return stats;
-    } catch (err) {
-        logger.debug(`Error upgrading local apps`, err.message);
-        return { skipped: false, upgraded: 0, failed: 0, total: 0, error: err.message };
-    }
-}
-
-async function upgrade(currentVersion, newVersion) {
-    logger.debug(`Starting local apps upgrade check: ${currentVersion} → ${newVersion}`);
-
-    if (currentVersion === '0.0.0') {
-        logger.debug('New installation detected, no apps to upgrade');
-        return { skipped: true, reason: 'new-install' };
-    }
-
-    return await upgradeLocalApps(currentVersion, newVersion);
-}
-
-module.exports = {
-    upgrade
+//seems still a bit unstable, thats why this feature is disabled by default
+//enable with 'u2a configure autoupgrade enable'
+
+
+
+const fs = require('fs');
+const path = require('path');
+const { readDB } = require('./config');
+const Logger = require('./logger');
+const { createApp } = require('../commands/create');
+const { removeApp } = require('../commands/remove');
+const { getSetting } = require('./settings');
+
+const logger = new Logger('upgradeLA');
+
+function isCoreUpdate(currentVersion, newVersion) {
+    try {
+        const [currentSecurity, currentCore, currentFeature] = currentVersion.split('.').map(Number);
+        const [newSecurity, newCore, newFeature] = newVersion.split('.').map(Number);
+
+        return (currentSecurity !== newSecurity || currentCore !== newCore);
+    } catch (err) {
+        logger.debug(`Error comparing versions: ${currentVersion} vs ${newVersion}`, err.message);
+        return false;
+    }
+}
+
+function extractDimensionsFromMainJs(mainJsPath) {
+    try {
+        if (!fs.existsSync(mainJsPath)) {
+            logger.warn(`main.js file not found at ${mainJsPath}`);
+            return { width: 1200, height: 800 };
+        }
+
+        const mainJsContent = fs.readFileSync(mainJsPath, 'utf8');
+
+        const widthMatch = mainJsContent.match(/const\s+WINDOW_WIDTH\s*=\s*(\d+)/);
+        const width = widthMatch ? parseInt(widthMatch[1], 10) : 1200;
+
+        const heightMatch = mainJsContent.match(/const\s+WINDOW_HEIGHT\s*=\s*(\d+)/);
+        const height = heightMatch ? parseInt(heightMatch[1], 10) : 800;
+
+        logger.debug(`Extracted dimensions from main.js: ${width}x${height}`);
+        return { width, height };
+    } catch (err) {
+        logger.debug(`Error extracting dimensions from main.js: ${mainJsPath}`, err.message);
+        return { width: 1200, height: 800 };
+    }
+}
+
+async function upgradeLocalApp(appName, appData) {
+    logger.debug(`Upgrading local app: ${appName}`);
+
+    try {
+        const { url, path: appPath, icon } = appData;
+
+        const mainJsPath = path.join(appPath, 'main.js');
+        const { width, height } = extractDimensionsFromMainJs(mainJsPath);
+
+        const options = {
+            name: appName,
+            width: width,
+            height: height,
+        };
+
+        if (icon)
+            options.icon = icon;
+
+
+        await removeApp(appName, false);
+        logger.debug(`Removed existing app: ${appName}`);
+
+        await createApp(url, options);
+        logger.debug(`Successfully upgraded: ${appName}`);
+
+        return true;
+    } catch (err) {
+        logger.debug(`Failed to upgrade ${appName}`, err.message);
+        return false;
+    }
+}
+
+async function upgradeLocalApps(currentVersion, newVersion) {
+    logger.debug(`Checking for local apps that need upgrading`);
+
+    const autoUpgradeEnabled = getSetting('autoupgrade_localapps');
+    if (!autoUpgradeEnabled) {
+        logger.debug(`Automatic upgrade for local apps is disabled. Skipping upgrades.`);
+        return { skipped: true, reason: 'disabled', upgraded: 0, failed: 0, total: 0 };
+    }
+
+    if (!isCoreUpdate(currentVersion, newVersion)) {
+        logger.debug(`Not a core update (${currentVersion} → ${newVersion}). Skipping local app upgrades.`);
+        return { skipped: true, reason: 'not-core-update', upgraded: 0, failed: 0, total: 0 };
+    }
+
+    try {
+        const db = readDB();
+        const apps = Object.keys(db);
+        const stats = { skipped: false, upgraded: 0, failed: 0, total: apps.length };
+
+        logger.debug(`Found ${apps.length} local apps to check for upgrade`);
+
+        for (const appName of apps) {
+            const appData = db[appName];
+
+            if (!appData.path || !fs.existsSync(appData.path)) { //skips if no path but shouldnt happen
+                logger.debug(`Skipping ${appName}: Not a local app or path doesn't exist`);
+                continue;
+            }
+
+            const success = await upgradeLocalApp(appName, appData);
+            if (success) {
+                stats.upgraded++;
+            } else {
+                stats.failed++;
+            }
+        }
+
+        logger.debug(`Local apps upgrade completed: ${stats.upgraded} upgraded, ${stats.failed} failed, ${apps.length - stats.upgraded - stats.failed} skipped`);
+        return stats;
+    } catch (err) {
+        logger.debug(`Error upgrading local apps`, err.message);
+        return { skipped: false, upgraded: 0, failed: 0, total: 0, error: err.message };
+    }
+}
+
+async function upgrade(currentVersion, newVersion) {
+    logger.debug(`Starting local apps upgrade check: ${currentVersion} → ${newVersion}`);
+
+    if (currentVersion === '0.0.0') {
+        logger.debug('New installation detected, no apps to upgrade');
+        return { skipped: true, reason: 'new-install' };
+    }
+
+    return await upgradeLocalApps(currentVersion, newVersion);
+}
+
+module.exports = {
+    upgrade
 };

package/src/utils/url.js

@@ -2,15 +2,18 @@ const axios = require('axios');
 const { sanitizeInput } = require('./sanitize');
 
 async function normalizeUrl(url) {
-  if (!url.startsWith('http://') && !url.startsWith('https://')) {
-    try {
-      await axios.get('https://' + url);
-      url = 'https://' + url;
-    } catch (error) {
-      url = 'http://' + url;
-    }
+  const sanitizedUrl = sanitizeInput(url);
+  
+  if (sanitizedUrl.startsWith('http://') || sanitizedUrl.startsWith('https://')) {
+    return sanitizedUrl;
+  }
+  
+  try {
+    await axios.get('https://' + sanitizedUrl);
+    return 'https://' + sanitizedUrl;
+  } catch (error) {
+    return 'http://' + sanitizedUrl;
   }
-  return sanitizeInput(url);
 }
 
 function getDomainName(url) {
@@ -25,4 +28,4 @@ function getDomainName(url) {
 module.exports = {
   normalizeUrl,
   getDomainName
-};
+};

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
 };

package/.github/workflows/npm-publish.yml

@@ -1,22 +0,0 @@
-name: Node.js Package
-
-on:
-  push:
-    paths:
-      - 'package.json'
-    branches:
-      - main
-
-jobs:
-
-  publish-npm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org/
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.npm_token }}