u2a 3.4.16 → 3.4.19

package/README.md

@@ -41,7 +41,7 @@ U2A is a command-line utility that allows you to transform any web URL into a st
 > Full support for MacOs and Linux apps not guaranteed.  
  
 ---
-Brought to you by [@douxxtech](https://github.com/douxxtech)
+Brought to you by the [U2A Team](https://github.com/orgs/url2app/people) <3
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "u2a",
-    "version": "3.4.16",
+    "version": "3.4.19",
     "description": "URL to App - Turn any URL into a desktop application",
     "main": "src/index.js",
     "bin": {

package/src/index.js

@@ -16,6 +16,8 @@ const { setupConfig } = require('./utils/config');
 const { checkNotRoot } = require('./utils/noroot');
 const { checkVersion } = require('./utils/versionCheck');
 
+setupConfig();
+
 (async () => {
   
   program
@@ -63,7 +65,4 @@ const { checkVersion } = require('./utils/versionCheck');
   
   await checkNotRoot(options.allowroot).catch(() => {});
   await checkVersion().catch(() => {});
-
-  setupConfig();
-
 })();

package/src/utils/logger.js

@@ -40,8 +40,8 @@ class Logger {
     this._writeToFile(formattedMessage);
   }
 
-  error(message, error = null) {
-    const formattedMessage = this._format('ERROR', `${message} ${error}`);
+  error(message, error = '') {
+    const formattedMessage = this._format('ERROR', `${message}${error ? ' ' + error : ''}`);
     console.log(chalk.red(formattedMessage));
     this._writeToFile(formattedMessage);
     

package/src/utils/versionCheck.js

@@ -4,42 +4,70 @@ const Logger = require('./logger');
 
 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) {
   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 retrived: ${latestVersion}`);
+    logger.debug(`Version retrieved: ${latestVersion}`);
     
-    const needsUpdate = compareVersions(version, latestVersion) <= 0;
+    const versionComparison = compareVersions(version, latestVersion);
+    const updateType = getUpdateType(version, latestVersion);
+    const needsUpdate = versionComparison < 0;
 
-    if (!silent && needsUpdate && latestVersion !== version) {
-      logger.debug(`New update available: ${latestVersion}`);
+    if (!silent && needsUpdate) {
+      logger.debug(`New update available: ${latestVersion} (${updateType})`);
       console.log('');
-      logger.warn(`A new update (${latestVersion}) is available ! Current version: ${version}`);
+      
+      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: 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: needsUpdate && latestVersion !== version
+      needsUpdate,
+      updateType,
+      updateDetails: needsUpdate ? getUpdateDetails(version, latestVersion) : null
     };
   } catch (error) {
     return {
       current: version,
       latest: null,
       needsUpdate: false,
+      updateType: UPDATE_TYPES.NONE,
       error: error.message
     };
   }
 }
 
-
 function compareVersions(v1, v2) {
   const parts1 = v1.split('.').map(Number);
   const parts2 = v2.split('.').map(Number);
@@ -55,6 +83,48 @@ function compareVersions(v1, v2) {
   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
+  checkVersion,
+  UPDATE_TYPES
 };