u2a 3.5.5 → 3.5.7

package/src/utils/appGenerator.js

@@ -1,125 +1,125 @@
-//Todo: replace electron logo with the one of the app in popup windows
-
-
-const fs = require('fs');
-const path = require('path');
-const Logger = require('./logger');
-
-const logger = new Logger('appGenerator');
-
-function generateMainJs(appName, url, iconPath, options = {}) {
-  const width = options.width || 1200;
-  const height = options.height || 800;
-
-  const templatePath = path.join(__dirname, 'app.js');
-  let template;
-
-  try {
-    template = fs.readFileSync(templatePath, 'utf8');
-  } catch (error) {
-    logger.error('Error reading electronApp.js template', error);
-    throw new Error('Failed to read Electron application template');
-  }
-
-  const mainJs = template
-    .replace('{APP_NAME}', appName)
-    .replace('{APP_URL}', url)
-    .replace('{APP_ICON_PATH}', iconPath.replace(/\\/g, '\\\\'))
-    .replace('{WINDOW_WIDTH}', width)
-    .replace('{WINDOW_HEIGHT}', height);
-
-  return mainJs;
-}
-
-async function createPackageJson(appName, iconPath, isExecutable = false, createSetup = false) {
-  const u2aPackagePath = path.resolve(__dirname, '../../package.json');
-
-  let u2aVersion = '1.0.0';
-  try {
-    const u2aPackageContent = fs.readFileSync(u2aPackagePath, 'utf8');
-    const u2aPackage = JSON.parse(u2aPackageContent);
-    u2aVersion = u2aPackage.version || u2aVersion;
-  } catch (error) {
-    logger.error('Error while fetching u2a package.json', error);
-  }
-
-  if (createSetup) {
-    const { processFavicon } = require('./favicon');
-    iconPath = await processFavicon(iconPath);
-  }
-
-  const packageJson = {
-    name: `u2a-${appName.replace(/\s+/g, '-')}`,
-    version: u2aVersion,
-    description: `Web app for ${appName}`,
-    main: 'main.js',
-    author: `${appName}`,
-    scripts: {
-      start: 'electron .'
-    },
-    dependencies: {
-      electron: '^22.0.0'
-    },
-    build: {
-      appId: `com.u2a.${appName.replace(/\s+/g, '-')}`,
-      productName: appName,
-      icon: iconPath
-    }
-  };
-
-  if (isExecutable) {
-    packageJson.devDependencies = {
-      "electron-packager": "^17.1.1",
-      "electron-builder": "^24.6.3",
-      "electron": "^22.0.0"
-    };
-
-    packageJson.dependencies = {};
-
-    packageJson.scripts.package = "electron-packager . --overwrite --asar";
-    packageJson.scripts.setup = "electron-builder";
-  }
-
-  if (isExecutable && createSetup) {
-    packageJson.build = {
-      ...packageJson.build,
-      appId: `com.u2a.${appName.replace(/\s+/g, '-')}`,
-      productName: appName,
-      directories: {
-        output: "installer"
-      },
-      files: [
-        "**/*",
-        "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
-        "!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
-        "!**/node_modules/*.d.ts",
-        "!**/node_modules/.bin",
-        "!**/.{idea,git,cache,build,dist}",
-        "!dist/**/*",
-        "!installer/**/*"
-      ],
-      win: {
-        target: "nsis",
-        icon: iconPath
-      },
-      mac: {
-        target: "dmg"
-      },
-      linux: {
-        target: "AppImage",
-        icon: iconPath
-      },
-      nsis: {
-        oneClick: false,
-        allowToChangeInstallationDirectory: true
-      }
-    };
-  }
-
-  return packageJson;
-}
-
-module.exports = {
-  generateMainJs,
-  createPackageJson
+//Todo: replace electron logo with the one of the app in popup windows
+
+
+const fs = require('fs');
+const path = require('path');
+const Logger = require('./logger');
+
+const logger = new Logger('appGenerator');
+
+function generateMainJs(appName, url, iconPath, options = {}) {
+  const width = options.width || 1200;
+  const height = options.height || 800;
+
+  const templatePath = path.join(__dirname, 'app.js');
+  let template;
+
+  try {
+    template = fs.readFileSync(templatePath, 'utf8');
+  } catch (error) {
+    logger.error('Error reading electronApp.js template', error);
+    throw new Error('Failed to read Electron application template');
+  }
+
+  const mainJs = template
+    .replace('{APP_NAME}', appName)
+    .replace('{APP_URL}', url)
+    .replace('{APP_ICON_PATH}', iconPath.replace(/\\/g, '\\\\'))
+    .replace('{WINDOW_WIDTH}', width)
+    .replace('{WINDOW_HEIGHT}', height);
+
+  return mainJs;
+}
+
+async function createPackageJson(appName, iconPath, isExecutable = false, createSetup = false) {
+  const u2aPackagePath = path.resolve(__dirname, '../../package.json');
+
+  let u2aVersion = '1.0.0';
+  try {
+    const u2aPackageContent = fs.readFileSync(u2aPackagePath, 'utf8');
+    const u2aPackage = JSON.parse(u2aPackageContent);
+    u2aVersion = u2aPackage.version || u2aVersion;
+  } catch (error) {
+    logger.error('Error while fetching u2a package.json', error);
+  }
+
+  if (createSetup) {
+    const { processFavicon } = require('./favicon');
+    iconPath = await processFavicon(iconPath);
+  }
+
+  const packageJson = {
+    name: `u2a-${appName.replace(/\s+/g, '-')}`,
+    version: u2aVersion,
+    description: `Web app for ${appName}`,
+    main: 'main.js',
+    author: `${appName}`,
+    scripts: {
+      start: 'electron .'
+    },
+    dependencies: {
+      electron: '^22.0.0'
+    },
+    build: {
+      appId: `com.u2a.${appName.replace(/\s+/g, '-')}`,
+      productName: appName,
+      icon: iconPath
+    }
+  };
+
+  if (isExecutable) {
+    packageJson.devDependencies = {
+      "electron-packager": "^17.1.1",
+      "electron-builder": "^24.6.3",
+      "electron": "^22.0.0"
+    };
+
+    packageJson.dependencies = {};
+
+    packageJson.scripts.package = "electron-packager . --overwrite --asar";
+    packageJson.scripts.setup = "electron-builder";
+  }
+
+  if (isExecutable && createSetup) {
+    packageJson.build = {
+      ...packageJson.build,
+      appId: `com.u2a.${appName.replace(/\s+/g, '-')}`,
+      productName: appName,
+      directories: {
+        output: "installer"
+      },
+      files: [
+        "**/*",
+        "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
+        "!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
+        "!**/node_modules/*.d.ts",
+        "!**/node_modules/.bin",
+        "!**/.{idea,git,cache,build,dist}",
+        "!dist/**/*",
+        "!installer/**/*"
+      ],
+      win: {
+        target: "nsis",
+        icon: iconPath
+      },
+      mac: {
+        target: "dmg"
+      },
+      linux: {
+        target: "AppImage",
+        icon: iconPath
+      },
+      nsis: {
+        oneClick: false,
+        allowToChangeInstallationDirectory: true
+      }
+    };
+  }
+
+  return packageJson;
+}
+
+module.exports = {
+  generateMainJs,
+  createPackageJson
 };

package/src/utils/builder.js

@@ -1,126 +1,126 @@
-const fs = require('fs');
-const path = require('path');
-const Logger = require('./logger');
-const { secureExec } = require('./securexec');
-
-const logger = new Logger('builder');
-
-async function buildExecutable(appDir, appName, platform, iconPath, options) {
-  logger.info(`Building executable for ${platform}...`);
-
-  try {
-    const installOptions = {
-      cwd: appDir,
-      stdio: ['ignore', 'pipe', 'pipe'],
-      windowsHide: true
-    };
-
-    secureExec('npm install --save-dev electron-packager electron', installOptions);
-
-    let platformFlag = '';
-    let archFlag = `--arch=${options.arch || 'x64'}`;
-    let iconOption = '';
-
-    switch (platform) {
-      case 'windows':
-        platformFlag = '--platform=win32';
-        iconOption = iconPath ? `--icon="${iconPath}"` : '';
-        break;
-      case 'darwin':
-        platformFlag = '--platform=darwin';
-        if (iconPath && !iconPath.endsWith('.icns')) {
-          logger.warn('MacOs Icons are not supported at this time.');
-        }
-        iconOption = iconPath ? `--icon="${iconPath}"` : '';
-        break;
-      case 'linux':
-        platformFlag = '--platform=linux';
-        iconOption = iconPath ? `--icon="${iconPath}"` : '';
-        break;
-      default:
-        platformFlag = `--platform=${process.platform}`;
-    }
-
-    const packageCommand = `npx electron-packager . "${appName}" ${platformFlag} ${archFlag} --out=dist --overwrite --asar ${iconOption}`;
-
-    logger.debug(`Executing: ${packageCommand}`);
-
-    secureExec(packageCommand, installOptions);
-
-    let distPlatform = '';
-    switch (platform) {
-      case 'windows': distPlatform = 'win32'; break;
-      case 'darwin': distPlatform = 'darwin'; break;
-      case 'linux': distPlatform = 'linux'; break;
-      default: distPlatform = process.platform;
-    }
-
-    const outputPath = path.join(appDir, 'dist', `${appName}-${distPlatform}-x64`);
-
-    if (fs.existsSync(outputPath)) {
-      logger.debug(`Executable built successfully at: ${outputPath}`);
-      return outputPath;
-    } else {
-      logger.error(`Failed to find the built executable at: ${outputPath}`);
-      return null;
-    }
-  } catch (error) {
-    logger.error(`Error while building executable:`, error);
-    return null;
-  }
-}
-
-async function buildSetup(appDir, platform, arch) {
-  logger.info(`Building setup for ${platform}${arch ? ` (${arch})` : ''}...`);
-
-  try {
-    const installOptions = {
-      cwd: appDir,
-      stdio: ['ignore', 'pipe', 'pipe'],
-      windowsHide: true
-    };
-
-    secureExec('npm install --save-dev electron-builder', installOptions);
-
-    let builderArgs = '';
-    switch (platform) {
-      case 'windows':
-        builderArgs = '--win';
-        break;
-      case 'darwin':
-        builderArgs = '--mac';
-        break;
-      case 'linux':
-        builderArgs = '--linux';
-        break;
-      default:
-        builderArgs = '';
-    }
-
-    if (arch) {
-      builderArgs += ` --${arch}`;
-    }
-
-    const builderCommand = `npx electron-builder ${builderArgs}`;
-    logger.debug(`Executing: ${builderCommand}`);
-    secureExec(builderCommand, installOptions);
-
-    const installerPath = path.join(appDir, 'installer');
-    if (fs.existsSync(installerPath)) {
-      logger.debug(`Setup created at: ${installerPath}`);
-      return installerPath;
-    } else {
-      logger.error(`Failed to find the built installer at: ${installerPath}`);
-      return null;
-    }
-  } catch (error) {
-    logger.error(`Error while building setup.`, error);
-    logger.warn('Try to run u2a with administrator privileges to avoid this error.');
-    return null;
-  }
-}
-
-module.exports = {
-  buildExecutable,
-  buildSetup
+const fs = require('fs');
+const path = require('path');
+const Logger = require('./logger');
+const { secureExec } = require('./securexec');
+
+const logger = new Logger('builder');
+
+async function buildExecutable(appDir, appName, platform, iconPath, options) {
+  logger.info(`Building executable for ${platform}...`);
+
+  try {
+    const installOptions = {
+      cwd: appDir,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      windowsHide: true
+    };
+
+    secureExec('npm install --save-dev electron-packager electron', installOptions);
+
+    let platformFlag = '';
+    let archFlag = `--arch=${options.arch || 'x64'}`;
+    let iconOption = '';
+
+    switch (platform) {
+      case 'windows':
+        platformFlag = '--platform=win32';
+        iconOption = iconPath ? `--icon="${iconPath}"` : '';
+        break;
+      case 'darwin':
+        platformFlag = '--platform=darwin';
+        if (iconPath && !iconPath.endsWith('.icns')) {
+          logger.warn('MacOs Icons are not supported at this time.');
+        }
+        iconOption = iconPath ? `--icon="${iconPath}"` : '';
+        break;
+      case 'linux':
+        platformFlag = '--platform=linux';
+        iconOption = iconPath ? `--icon="${iconPath}"` : '';
+        break;
+      default:
+        platformFlag = `--platform=${process.platform}`;
+    }
+
+    const packageCommand = `npx electron-packager . "${appName}" ${platformFlag} ${archFlag} --out=dist --overwrite --asar ${iconOption}`;
+
+    logger.debug(`Executing: ${packageCommand}`);
+
+    secureExec(packageCommand, installOptions);
+
+    let distPlatform = '';
+    switch (platform) {
+      case 'windows': distPlatform = 'win32'; break;
+      case 'darwin': distPlatform = 'darwin'; break;
+      case 'linux': distPlatform = 'linux'; break;
+      default: distPlatform = process.platform;
+    }
+
+    const outputPath = path.join(appDir, 'dist', `${appName}-${distPlatform}-x64`);
+
+    if (fs.existsSync(outputPath)) {
+      logger.debug(`Executable built successfully at: ${outputPath}`);
+      return outputPath;
+    } else {
+      logger.error(`Failed to find the built executable at: ${outputPath}`);
+      return null;
+    }
+  } catch (error) {
+    logger.error(`Error while building executable:`, error);
+    return null;
+  }
+}
+
+async function buildSetup(appDir, platform, arch) {
+  logger.info(`Building setup for ${platform}${arch ? ` (${arch})` : ''}...`);
+
+  try {
+    const installOptions = {
+      cwd: appDir,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      windowsHide: true
+    };
+
+    secureExec('npm install --save-dev electron-builder', installOptions);
+
+    let builderArgs = '';
+    switch (platform) {
+      case 'windows':
+        builderArgs = '--win';
+        break;
+      case 'darwin':
+        builderArgs = '--mac';
+        break;
+      case 'linux':
+        builderArgs = '--linux';
+        break;
+      default:
+        builderArgs = '';
+    }
+
+    if (arch) {
+      builderArgs += ` --${arch}`;
+    }
+
+    const builderCommand = `npx electron-builder ${builderArgs}`;
+    logger.debug(`Executing: ${builderCommand}`);
+    secureExec(builderCommand, installOptions);
+
+    const installerPath = path.join(appDir, 'installer');
+    if (fs.existsSync(installerPath)) {
+      logger.debug(`Setup created at: ${installerPath}`);
+      return installerPath;
+    } else {
+      logger.error(`Failed to find the built installer at: ${installerPath}`);
+      return null;
+    }
+  } catch (error) {
+    logger.error(`Error while building setup.`, error);
+    logger.warn('Try to run u2a with administrator privileges to avoid this error.');
+    return null;
+  }
+}
+
+module.exports = {
+  buildExecutable,
+  buildSetup
 }

package/src/utils/config.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
+
 const CONFIG_DIR = path.join(os.homedir(), '.u2a');
 const APPS_DIR = path.join(CONFIG_DIR, 'apps');
 const LOGS_DIR = path.join(CONFIG_DIR, 'logs');
@@ -34,11 +35,10 @@ function writeDB(data) {
   fs.writeFileSync(DB_PATH, JSON.stringify(data, null, 2));
 }
 
-function addAppToDB(domain, appData) {
+function addAppToDB(appName, appData) {
   const db = readDB();
-  db[domain] = appData;
+  db[appName] = appData;
   writeDB(db);
-  logger.debug(`Application recorded in the database:`, domain);
 }
 
 module.exports = {

package/src/utils/logger.js

@@ -77,4 +77,4 @@ class Logger {
   }
 }
 
-module.exports = Logger;
+module.exports = Logger;

package/src/utils/noroot.js

@@ -1,41 +1,41 @@
-const os = require('os');
-const isAdmin = require('is-admin');
-const Logger = require('./logger')
-
-const logger = new Logger('noroot');
-
-async function checkNotRoot(allowRoot = false) {
-  if (allowRoot) {
-    logger.warn('Running with elevated privileges. This is not recommended.');
-    return;
-  }
-
-  const platform = os.platform();
-
-  switch (platform) {
-    case 'win32':
-      if (await isAdmin()) {
-        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;
-
-    case 'darwin':
-    case 'linux':
-      if (process.getuid() === 0) {
-        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;
-
-    default:
-      logger.error('Unsupported platform:', platform);
-      process.exit(1);
-  }
-}
-
-module.exports = { checkNotRoot };
+const os = require('os');
+const isAdmin = require('is-admin');
+const Logger = require('./logger')
+
+const logger = new Logger('noroot');
+
+async function checkNotRoot(allowRoot = false) {
+  if (allowRoot) {
+    logger.warn('Running with elevated privileges. This is not recommended.');
+    return;
+  }
+
+  const platform = os.platform();
+
+  switch (platform) {
+    case 'win32':
+      if (await isAdmin()) {
+        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;
+
+    case 'darwin':
+    case 'linux':
+      if (process.getuid() === 0) {
+        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;
+
+    default:
+      logger.error('Unsupported platform:', platform);
+      process.exit(1);
+  }
+}
+
+module.exports = { checkNotRoot };