u2a 3.4.13 → 3.4.16

package/package.json

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

package/src/commands/create.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const { normalizeUrl, getDomainName } = require('../utils/url');
 const { getFavicon, processFavicon } = require('../utils/favicon');
 const { APPS_DIR, readDB, writeDB } = require('../utils/config');
@@ -57,7 +56,20 @@ async function createApp(url, options) {
       return;
     }
 
-    const iconPath = await getFavicon(url);
+    let iconPath;
+    if (options.icon) {
+      const iconFilePath = path.resolve(options.icon);
+      if (fs.existsSync(iconFilePath) && path.extname(iconFilePath) === '.ico') {
+        iconPath = iconFilePath;
+        logger.success(`Using ${iconPath} for ${appName}`)
+      } else {
+        logger.warn(`Provided icon path is not a valid .ico file: ${iconFilePath}`);
+      }
+    }
+
+    if (!iconPath) {
+      iconPath = await getFavicon(url);
+    }
 
     const appDir = path.join(APPS_DIR, appName);
     if (!fs.existsSync(appDir)) {
@@ -99,41 +111,38 @@ async function createApp(url, options) {
         const setupPath = await buildSetup(appDir, targetPlatform, options.arch);
         if (setupPath) {
           logger.debug(`Setup installer created at: ${setupPath}`);
-          
+
           const currentDir = process.cwd();
           const setupTargetDir = path.join(currentDir, `${appName}-setup`);
-          
+
           if (!fs.existsSync(setupTargetDir)) {
             fs.mkdirSync(setupTargetDir, { recursive: true });
           }
-          
+
           copyFolderRecursiveSync(setupPath, setupTargetDir);
           logger.success(`Setup installer created at: ${setupTargetDir}`);
         }
       }
-      
+
       if (executablePath) {
         logger.debug(`Executable created at: ${executablePath}`);
-        
+
         const currentDir = process.cwd();
         const targetDir = path.join(currentDir, `${appName}-executable`);
-        
+
         if (!fs.existsSync(targetDir)) {
           fs.mkdirSync(targetDir, { recursive: true });
         }
-        
+
         copyFolderRecursiveSync(executablePath, targetDir);
-        
+
         logger.success(`Executable created at: ${targetDir}`);
-        
+
         executablePath = targetDir;
-        
+
         removeAppFromOS(appName);
         remove(appDir);
-        if (path.basename(iconPath) !== "favicon.ico") {
-          remove(iconPath);
-        }
-        
+
         logger.debug(`Temporary application files removed after executable creation`);
         return;
       }

package/src/commands/remove.js

@@ -5,6 +5,7 @@ const Logger = require('../utils/logger');
 const { removeAppFromOS } = require('./create');
 const path = require('path');
 const { sanitizeInput } = require('../utils/sanitize');
+const { getDomainName } = require('../utils/url');
 
 const logger = new Logger('remove');
 
@@ -32,12 +33,13 @@ async function processRemoval(appName) {
     }
 
     const appInfo = db[appName];
+    const domain = getDomainName(appInfo.url)
     const appDir = appInfo.path;
 
     logger.info(`Removing the application ${appName}...`);
     removeAppFromOS(appName);
 
-    const iconPath = path.join(APPS_DIR, `${appName}.ico`);
+    const iconPath = path.join(APPS_DIR, `${domain}.ico`);
     if (fs.existsSync(iconPath)) {
       fs.unlinkSync(iconPath);
       logger.success(`Icon for ${appName} removed`);
@@ -60,8 +62,8 @@ async function processRemoval(appName) {
     }
 
     fs.rmSync(appDir, { recursive: true, force: true });
+    logger.success(`Application files removed: ${appDir}`);
 
-    fs.rmSync(appDir, { recursive: true, force: true });
     delete db[appName];
     writeDB(db);
 

package/src/index.js

@@ -30,6 +30,7 @@ const { checkVersion } = require('./utils/versionCheck');
     .option('--name <name>', 'Specify the application name')
     .option('--width <width>', 'Specify the window width', parseInt)
     .option('--height <height>', 'Specify the window height', parseInt)
+    .option('--icon <path>', 'Use a custom icon (.ico) instead of the default one')
     .option('--executable [windows|darwin|linux]', 'Create a single executable for the target system')
     .option('--arch [x64|armv7l|arm64|universal]', 'Specify the target architecture for the executable')
     .option('--setup', 'Creates a setup file for the executable')

package/src/utils/versionCheck.js

@@ -19,6 +19,7 @@ async function checkVersion(silent = false) {
 
     if (!silent && needsUpdate && latestVersion !== version) {
       logger.debug(`New update available: ${latestVersion}`);
+      console.log('');
       logger.warn(`A new update (${latestVersion}) is available ! Current version: ${version}`);
       logger.warn(`Update u2a with: npm install -g u2a@${latestVersion}`);
     }