u2a 3.4.19 → 3.5.0

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "u2a",
-    "version": "3.4.19",
+    "version": "3.5.0",
     "description": "URL to App - Turn any URL into a desktop application",
     "main": "src/index.js",
     "bin": {
         "u2a": "src/index.js"
     },
     "scripts": {
-        "start": "node src/index.js"
+        "start": "node src/index.js",
+        "postinstall": "node src/utils/postinstall.js"
     },
     "keywords": [
         "cli",

package/src/commands/configure.js

@@ -0,0 +1,63 @@
+const fs = require('fs');
+const { SETTINGS_PATH } = require('../utils/config');
+const Logger = require('../utils/logger');
+const chalk = require('chalk');
+
+const logger = new Logger('configure');
+
+function configureReports(action) {
+  try {
+    let settings = {};
+    if (fs.existsSync(SETTINGS_PATH)) {
+      settings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
+    }
+
+    if (action === 'status') {
+      const status = settings.send_anon_reports !== false;
+      logger.info(`Anonymous reports are currently ${status ? chalk.green('enabled') : chalk.yellow('disabled')}`);
+      return;
+    } else if (action === 'enable') {
+      settings.send_anon_reports = true;
+      logger.info(chalk.green('Anonymous reports have been enabled'));
+    } else if (action === 'disable') {
+      settings.send_anon_reports = false;
+      logger.info(chalk.yellow('Anonymous reports have been disabled'));
+    } else {
+      logger.error(`Invalid action: ${action}`);
+      logger.info('Available actions: status, enable, disable');
+      return;
+    }
+
+    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
+  } catch (err) {
+    logger.error(`Error configuring reports`, err.message);
+  }
+}
+
+function configure(category, action) {
+  if (!category || !action) {
+    logger.error('Missing category or action');
+    logger.info('Usage: u2a configure [category] [action]');
+    logger.info('Available categories:');
+    logger.info('  reports - Configure anonymous usage reports');
+    logger.info('Available actions:');
+    logger.info('  status  - Check current status');
+    logger.info('  enable  - Enable specified category');
+    logger.info('  disable - Disable specified category');
+    return;
+  }
+
+  switch (category) {
+    case 'reports':
+      configureReports(action);
+      break;
+    default:
+      logger.error(`Unknown configuration category: ${category}`);
+      logger.info('Available categories: reports');
+      break;
+  }
+}
+
+module.exports = {
+  configure
+};

package/src/index.js

@@ -11,6 +11,7 @@ const { program } = require('commander');
 const { createApp } = require('./commands/create');
 const { listApps } = require('./commands/list');
 const { removeApp } = require('./commands/remove');
+const { configure } = require('./commands/configure');
 const { version } = require('../package.json');
 const { setupConfig } = require('./utils/config');
 const { checkNotRoot } = require('./utils/noroot');
@@ -50,6 +51,13 @@ setupConfig();
     .description('Remove an existing application')
     .action(removeApp);
 
+  program
+  .command('configure [category] [action]')
+  .description('Configure application settings')
+  .action((category, action) => {
+    configure(category, action);
+  });
+
   program.on('command:*', () => {
     console.error(`\nInvalid command: ${program.args.join(' ')}`);
     console.log(`\nUse --help to see the list of available commands.`);

package/src/utils/appGenerator.js

@@ -254,7 +254,7 @@ app.on('activate', () => {
   }
 });
 `;
-}
+} // note for one day: put this in a different file
 
 async function createPackageJson(appName, iconPath, isExecutable = false, createSetup = false) {
   const u2aPackagePath = path.resolve(__dirname, '../../package.json');

package/src/utils/builder.js

@@ -114,7 +114,8 @@ async function buildSetup(appDir, platform, arch) {
       return null;
     }
   } catch (error) {
-    logger.error(`Error while building setup:`, error);
+    logger.error(`Error while building setup.`, error);
+    logger.warn('Try to run u2a with administrator privileges to avoid this error.');
     return null;
   }
 }

package/src/utils/config.js

@@ -6,6 +6,7 @@ const CONFIG_DIR = path.join(os.homedir(), '.u2a');
 const APPS_DIR = path.join(CONFIG_DIR, 'apps');
 const LOGS_DIR = path.join(CONFIG_DIR, 'logs');
 const DB_PATH = path.join(CONFIG_DIR, 'db.json');
+const SETTINGS_PATH = path.join(CONFIG_DIR, 'settings.json');
 
 function setupConfig() {
   if (!fs.existsSync(CONFIG_DIR)) {
@@ -20,6 +21,9 @@ function setupConfig() {
   if (!fs.existsSync(DB_PATH)) {
     fs.writeFileSync(DB_PATH, JSON.stringify({}, null, 2));
   }
+  if (!fs.existsSync(SETTINGS_PATH)) {
+    fs.writeFileSync(SETTINGS_PATH, JSON.stringify({}, null, 2));
+  }
 }
 
 function readDB() {
@@ -41,6 +45,8 @@ module.exports = {
   CONFIG_DIR,
   APPS_DIR,
   LOGS_DIR,
+  DB_PATH,
+  SETTINGS_PATH,
   setupConfig,
   readDB,
   writeDB,

package/src/utils/logger.js

@@ -3,6 +3,18 @@ const path = require('path');
 const chalk = require('chalk');
 const { LOGS_DIR } = require('./config');
 
+/*
+  To use:
+  const Logger = require('./logger');
+  const logger = new Logger('name');
+
+  //then
+  logger.info('information');
+  logger.warn('warning');
+  logger.error('error message', 'error');
+*/
+
+
 class Logger {
   constructor(component) {
     this.component = component;
@@ -24,7 +36,7 @@ class Logger {
 
   info(message) {
     const formattedMessage = this._format('INFO', message);
-    console.log(chalk.blue(formattedMessage));
+    console.log(chalk.blueBright(formattedMessage));
     this._writeToFile(formattedMessage);
   }
 

package/src/utils/noroot.js

@@ -6,7 +6,7 @@ const logger = new Logger('noroot');
 
 async function checkNotRoot(allowRoot = false) {
   if (allowRoot) {
-    logger.warn('Running with elevated privileges. This is not recommended.', '');
+    logger.warn('Running with elevated privileges. This is not recommended.');
     return;
   }
 
@@ -15,7 +15,9 @@ async function checkNotRoot(allowRoot = false) {
   switch (platform) {
     case 'win32':
       if (await isAdmin()) {
-        logger.error('This application should not be run as an administrator.', '');
+        logger.error('This application should not be run as an administrator.');
+        logger.warn('Run with --allowroot to avoid this message.');
+        logger.warn('Running u2a as administrator can be dangerous.');
         process.exit(1);
       }
       break;
@@ -23,7 +25,9 @@ async function checkNotRoot(allowRoot = false) {
     case 'darwin':
     case 'linux':
       if (process.getuid() === 0) {
-        logger.error('This application should not be run as root.', '');
+        logger.error('This application should not be run as root.');
+        logger.warn('Run with --allowroot to avoid this message.');
+        logger.warn('Running u2a as root can be dangerous.');
         process.exit(1);
       }
       break;

package/src/utils/postinstall.js

@@ -0,0 +1,126 @@
+const fs = require('fs');
+const path = require('path');
+const axios = require('axios');
+const Logger = require('./logger');
+const { setupConfig, CONFIG_DIR, SETTINGS_PATH } = require('./config');
+
+setupConfig(); // builds ~/.u2a/*
+
+const logger = new Logger('postinstall');
+const postinstallJsonPath = path.join(CONFIG_DIR, 'postinstall.json');
+let isUpgrade = false;
+let currentVersion = '0.0.0'; //0.0.0 for new installations
+let sendAnonReports = true; // u2a configure reports disable to disable
+
+const formatVersionLine = (label, version) => {
+    // calculates how many spaces we need after the version to have a correct formatting
+    const baseLength = `; ${label}: `.length + version.length;
+    const spaceCount = Math.max(0, 30 - baseLength);
+    const spaces = ' '.repeat(spaceCount);
+    
+    return `; ${label}: ${version}${spaces};`;
+};
+
+async function run() {
+    //check if postinstall.json exists (exists -> update, doesnt -> new install)
+    if (fs.existsSync(postinstallJsonPath)) {
+        try {
+            const postinstallData = JSON.parse(fs.readFileSync(postinstallJsonPath, 'utf8'));
+            currentVersion = postinstallData.version || '';
+            isUpgrade = true;
+            
+            let newVersion = '';
+            try {
+                const packageJsonPath = path.join(__dirname, '..', '..', 'package.json');
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                newVersion = packageJson.version || '';
+            } catch (err) {
+                logger.error(`Error reading package.json for display`, err.message);
+                newVersion = 'unknown';
+            }
+            
+            logger.info(';=============================;');
+            logger.info('; u2a has been updated!       ;');
+            logger.info('; Successfully migrated from  ;');
+            logger.info(formatVersionLine('Old version', currentVersion));
+            logger.info(formatVersionLine('New version', newVersion));
+            logger.info(';=============================;');
+        } catch (err) {
+            logger.error(`Error reading postinstall.json`, err.message);
+            isUpgrade = false;
+        }
+    }
+
+    if (fs.existsSync(SETTINGS_PATH)) {
+        try {
+            const settingsData = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
+            sendAnonReports = settingsData.send_anon_reports !== false;
+        } catch (err) {
+            logger.error(`Error reading settings.json`, err.message);
+            sendAnonReports = true;
+        }
+    }
+
+    // shows this cool message if it isnt an upgrade
+    if (!isUpgrade) {
+        logger.info(';=============================;');
+        logger.info('; Welcome to u2a !            ;');
+        logger.info('; Thanks for downloading this ;');
+        logger.info('; tool !                      ;');
+        logger.info(';                             ;');
+        logger.info('; Create a local webapp with  ;');
+        logger.info('; \'u2a create <url/domain>\'   ;');
+        logger.info(';                             ;');
+        logger.info('; Check docs.urltoapp.xyz for ;');
+        logger.info('; more detailed usage.        ;');
+        logger.info(';                             ;');
+        logger.info('; Note: Anonymous installs    ;');
+        logger.info('; reports are enabled by      ;');
+        logger.info('; default. To disable:        ;');
+        logger.info('; \'u2a configure reports      ;');
+        logger.info('; disable\'                    ;');
+        logger.info(';=============================;');
+        
+        const settings = { send_anon_reports: true };
+        fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
+    }
+
+    const packageJsonPath = path.join(__dirname, '..', '..', 'package.json');
+    let newVersion = '';
+    
+    try {
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        newVersion = packageJson.version || '';
+    } catch (err) {
+        logger.error(`Error reading package.json`, err.message);
+    }
+
+    if (sendAnonReports) {
+        try {
+
+            const params = new URLSearchParams({
+                previousVersion: currentVersion,
+                newVersion: newVersion
+            });
+
+            // backend here https://github.com/url2app/urltoapp.xyz/blob/main/api/v1/api/reports.php
+            await axios.get(`https://urltoapp.xyz/api/v1/reports?${params.toString()}`);
+            logger.debug('Anonymous usage report sent');
+        } catch (err) {
+            logger.debug(`Failed to send anonymous report: ${err.message}`);
+        }
+    }
+
+    try {
+        fs.writeFileSync(postinstallJsonPath, JSON.stringify({
+            version: newVersion,
+            installed_at: new Date().toISOString()
+        }, null, 2));
+    } catch (err) {
+        logger.error(`Error updating postinstall.json`, err.message);
+    }
+}
+
+run().catch(err => {
+    logger.error(`Unexpected error`, err.message);
+});