u2a 3.5.5 → 3.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "u2a",
-    "version": "3.5.5",
+    "version": "3.5.6",
     "description": "URL to App - Turn any URL into a desktop application",
     "main": "src/index.js",
     "bin": {
@@ -8,7 +8,9 @@
     },
     "scripts": {
         "start": "node src/index.js",
-        "postinstall": "node src/utils/postinstall.js"
+        "postinstall": "node src/utils/postinstall.js",
+        "test": "jest",
+        "wta": "jest --watchAll --verbose"
     },
     "keywords": [
         "cli",
@@ -28,10 +30,13 @@
         "electron": "^22.0.0",
         "icojs": "^0.19.5",
         "inquirer": "^8.2.5",
+        "is-admin": "^3.0.0",
         "open": "^8.4.0",
         "png-to-ico": "^2.1.8",
-        "sharp": "^0.33.5",
-        "is-admin": "^3.0.0"
+        "sharp": "^0.33.5"
+    },
+    "devDependencies": {
+        "jest": "^29.7.0"
     },
     "homepage": "https://urltoapp.xyz",
     "repository": {

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/settings.js

@@ -22,7 +22,7 @@ function initSettings(reset = false) {
                 currentSettings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
                 logger.debug('Existing settings loaded');
             } catch (err) {
-                logger.debug(`Error reading existing settings.json, will reinitialize`, err.message);
+                logger.debug(`Error reading existing settings.json, will reset`, err.message);
                 currentSettings = {};
             }
         }

package/src/utils/url.js

@@ -2,15 +2,18 @@ const axios = require('axios');
 const { sanitizeInput } = require('./sanitize');
 
 async function normalizeUrl(url) {
-  if (!url.startsWith('http://') && !url.startsWith('https://')) {
-    try {
-      await axios.get('https://' + url);
-      url = 'https://' + url;
-    } catch (error) {
-      url = 'http://' + url;
-    }
+  const sanitizedUrl = sanitizeInput(url);
+  
+  if (sanitizedUrl.startsWith('http://') || sanitizedUrl.startsWith('https://')) {
+    return sanitizedUrl;
+  }
+  
+  try {
+    await axios.get('https://' + sanitizedUrl);
+    return 'https://' + sanitizedUrl;
+  } catch (error) {
+    return 'http://' + sanitizedUrl;
   }
-  return sanitizeInput(url);
 }
 
 function getDomainName(url) {
@@ -25,4 +28,4 @@ function getDomainName(url) {
 module.exports = {
   normalizeUrl,
   getDomainName
-};
+};

package/.github/workflows/npm-publish.yml

@@ -1,22 +0,0 @@
-name: Node.js Package
-
-on:
-  push:
-    paths:
-      - 'package.json'
-    branches:
-      - main
-
-jobs:
-
-  publish-npm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org/
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.npm_token }}