u2a 1.0.0 → 2.1.0

package/package.json

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

package/src/commands/create.js

@@ -6,7 +6,6 @@ const { getFavicon } = require('../utils/favicon');
 const { APPS_DIR, readDB, writeDB } = require('../utils/config');
 const Logger = require('../utils/logger');
 const os = require('os');
-const { isContext } = require('vm');
 
 const logger = new Logger('create');
 
@@ -194,24 +193,75 @@ function generateMainJs(domain, url, iconPath) {
   return `
 const { app, BrowserWindow, Menu, shell } = require('electron');
 const path = require('path');
+const fs = require('fs');
+
+const APP_DOMAIN = "${domain}";
+const APP_URL = "${url}";
+const APP_ICON_PATH = "${iconPath.replace(/\\/g, '\\\\')}";
 
 let mainWindow;
 
+function logAppInfo() {
+  const packageJsonPath = path.join(__dirname, 'package.json');
+  let packageInfo = {};
+  
+  try {
+    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8');
+    packageInfo = JSON.parse(packageJsonContent);
+  } catch (error) {
+    console.error('Error reading package.json:', error.message);
+  }
+
+  console.log('\\n--------------------------------');
+  console.log('  APPLICATION INFORMATION');
+  console.log('--------------------------------');
+  console.log(\`Application: \${APP_DOMAIN}\`);
+  console.log(\`URL: \${APP_URL}\`);
+  console.log(\`Started at: \${new Date().toLocaleString()}\`);
+  console.log(\`App directory: \${__dirname}\`);
+  console.log(\`Icon path: \${APP_ICON_PATH}\`);
+  
+  console.log('\\n  PACKAGE INFO:');
+  console.log(\`  - Name: \${packageInfo.name || 'N/A'}\`);
+  console.log(\`  - Version: \${packageInfo.version || 'N/A'}\`);
+  console.log(\`  - Description: \${packageInfo.description || 'N/A'}\`);
+  console.log(\`  - Electron version: \${packageInfo.dependencies?.electron || 'N/A'}\`);
+  
+  if (packageInfo.build) {
+    console.log('\\n  BUILD CONFIG:');
+    console.log(\`  - App ID: \${packageInfo.build.appId || 'N/A'}\`);
+    console.log(\`  - Product Name: \${packageInfo.build.productName || 'N/A'}\`);
+  }
+  
+  console.log('--------------------------------\\n');
+}
+
 function createWindow() {
-  app.setAppUserModelId("${domain}");
+  logAppInfo();
+  
+  app.setAppUserModelId(APP_DOMAIN);
 
   mainWindow = new BrowserWindow({
     width: 1200,
     height: 800,
-    title: "${domain}",
-    icon: "${iconPath.replace(/\\/g, '\\\\')}",
+    title: APP_DOMAIN,
+    icon: APP_ICON_PATH,
     webPreferences: {
       nodeIntegration: false,
       contextIsolation: true
     }
   });
 
-  mainWindow.loadURL("${url}");
+  mainWindow.loadURL(APP_URL);
+
+  mainWindow.webContents.on('context-menu', (e, params) => {
+    e.preventDefault();
+    mainWindow.webContents.executeJavaScript(\`
+      window.addEventListener('contextmenu', (e) => {
+        e.stopPropagation();
+      }, true);
+    \`);
+  });
 
   mainWindow.webContents.on('new-window', (event, url) => {
     event.preventDefault();
@@ -243,10 +293,23 @@ app.on('activate', () => {
 });
 `;
 }
+
+
 function generatePackageJson(domain, iconPath) {
+  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)
+  }
+  
   return {
     name: `u2a-${domain}`,
-    version: '1.0.0',
+    version: u2aVersion,
     description: `Web app for ${domain}`,
     main: 'main.js',
     scripts: {
@@ -267,7 +330,7 @@ async function createApp(url) {
   logger.info(`Creating application for ${url}`);
 
   try {
-    url = normalizeUrl(url);
+    url = await normalizeUrl(url);
     const domain = getDomainName(url);
 
     const db = readDB();

package/src/commands/remove.js

@@ -10,7 +10,7 @@ const logger = new Logger('remove');
 
 async function removeApp(url) {
   try {
-    const domain = getDomainName(normalizeUrl(url));
+    const domain = getDomainName(await normalizeUrl(url));
     const db = readDB();
 
     if (!db.hasOwnProperty(domain)) {

package/src/utils/favicon.js

@@ -13,7 +13,7 @@ async function getFavicon(url) {
 
   try {
     const domain = getDomainName(url);
-    const normalizedUrl = normalizeUrl(url);
+    const normalizedUrl = await normalizeUrl(url);
     
     const faviconUrl = `${normalizedUrl}/favicon.ico`;
     const iconResponse = await axios.get(faviconUrl, { responseType: 'arraybuffer' });

package/src/utils/url.js

@@ -1,6 +1,13 @@
-function normalizeUrl(url) {
+const axios = require('axios');
+
+async function normalizeUrl(url) {
   if (!url.startsWith('http://') && !url.startsWith('https://')) {
-    url = 'https://' + url;
+    try {
+      await axios.get('https://' + url);
+      url = 'https://' + url;
+    } catch (error) {
+      url = 'http://' + url;
+    }
   }
   return url;
 }
@@ -17,4 +24,4 @@ function getDomainName(url) {
 module.exports = {
   normalizeUrl,
   getDomainName
-};
+};