modified: appnativefy.js

	modified:   package-lock.json
	modified:   package.json
	modified:   script.sh

Author: sarwesh00

appnativefy.js

@@ -1,14 +1,28 @@
 #!/usr/bin/env node
 
+const fs = require('fs');
 var yargs = require('yargs');
+var nativefier = require('nativefier').default;
+var process = require('process');
+const request = require('request')
+
+
 const {
     exec
 } = require("child_process");
+
+var blankstr = ""
+
+
 console.log(__dirname);
+const dirname = __dirname;
+var style = blankstr.concat(__dirname, "/style.css");
+console.log(style)
+
 var argv = require('yargs/yargs')(process.argv.slice(2))
     .usage('Make executable AppImages from any Website URL\n\nUsage: $0 [options]')
     .help('help').alias('help', 'h')
-    .version('version', '1.2.0').alias('version', 'V')
+    .version('version', '1.3.0').alias('version', 'V')
     .options({
         name: {
             alias: 'n',
@@ -76,15 +90,28 @@ var argv = require('yargs/yargs')(process.argv.slice(2))
     })
     .argv;
 
-var blankstr = ""
 
 str = argv.name
 var name = str.replace(/\s+/g, '-')
 
-var url = blankstr.concat('"', argv.url, '"')
+var url = argv.url
+
+var appnativefydir = blankstr.concat(process.env['HOME'], "/appnativefy");
+console.log(appnativefydir);
+try {
+    if (!fs.existsSync(appnativefydir)) {
+        fs.mkdirSync(appnativefydir);
+        console.log("Directory is created.");
+    } else {
+        console.log("Directory already exists.");
+    }
+} catch (err) {
+    console.log(err);
+}
+
 
 if (argv.arch === undefined) {
-    arch = "x64";
+    var arch = "x64";
 } else {
     var arch = argv.arch
 }
@@ -96,7 +123,7 @@ if (argv.appCopyright === undefined) {
 }
 
 if (argv.appVersion === undefined) {
-    var appversion = "";
+    var appversion = "1.0.0";
 } else {
     var appversion = blankstr.concat("--app-version", " ", '"', argv.appVersion, '"')
 }
@@ -107,66 +134,79 @@ if (argv.electronVersion === undefined) {
     var electronversion = blankstr.concat("--electron-version", " ", '"', argv.electronVersion, '"')
 }
 
-var inject = "--inject style.css"
 
 if (argv.widevine === true) {
-    var widevine = "--widevine";
+    var widevine = true
 } else {
-    var widevine = ""
+    var widevine = false
 }
 
+const download = (favicongen, icon, callback) => {
+    request.head(favicongen, (err, res, body) => {
+      request(favicongen)
+        .pipe(fs.createWriteStream(icon))
+        .on('close', callback)
+    })
+  }
+
 if (argv.favicon === true) {
-    var favicongen = blankstr.concat(" && wget ", '"', "https://www.google.com/s2/favicons?sz=64&domain_url=", argv.url, '"', " ", "-O icon.png ");
-    var icon = '--icon "icon.png"'
+    var favicongen = blankstr.concat("https://www.google.com/s2/favicons?sz=64&domain_url=", argv.url);
+    var icon = appnativefydir.concat("/icon.png");
+    var customicon = blankstr.concat('"', icon, '"')
+    download(favicongen, icon, () => {
+        console.log('✅ Done!')
+      })
 } else {
     var favicongen = ""
     var icon = ""
 }
 
 if (argv.services === true) {
-    var services = '--user-agent "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:85.0) Gecko/20100101 Firefox/85.0"';
+    var honest = false
+    var services = '"Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:85.0) Gecko/20100101 Firefox/85.0"';
     if (argv.internalurls === undefined) {
-        var internalurls = '--internal-urls "(.*)"';
+        var internalurls = '(.*)';
     } else {
-        var internalurls = blankstr.concat("--internal-urls", " ", argv.internalurls)
+        var internalurls = argv.internalurls
     }
 } else {
-    var services = "--honest"
+    var honest = true
+    var services = ""
     if (argv.internalurls === undefined) {
-        var internalurls = "";
+        var internalurls = ".*?";
     } else {
-        var internalurls = blankstr.concat("--internal-urls", " ", argv.internalurls)
+        var internalurls = argv.internalurls
     }
-} 
+}
 
 if (argv.saveAs === true) {
-    var downloaddialog = '--file-download-options \'{"saveAs": true}\'';
+    var downloaddialog = true;
 } else {
-    var downloaddialog = "";
+    var downloaddialog = false;
 }
 
 if (argv.noOverwrite === true) {
-    var nooverwrite = '--no-overwrite "true"';
+    var overwrite = false;
 } else {
-    var nooverwrite = ""
+    var overwrite = true
 }
 
 if (argv.conceal === true) {
-    var conceal = "--conceal";
+    var conceal = true;
 } else {
-    var conceal = ""
+    var conceal = false
 }
 
 if (argv.counter === true) {
-    var counter = "--counter";
+    var counter = true;
 } else {
-    var counter = ""
+    var counter = false
 }
 
 if (argv.singleinstance === true) {
-    var singleinstance = "--single-instance";
+    var singleinstance = true;
 } else {
-    var singleinstance = ""
+    var singleinstance = false
 }
 
 
@@ -177,46 +217,106 @@ console.log("url:", url);
 console.log("app copyright:", argv.appCopyright);
 console.log("app version:", argv.appVersion);
 console.log("electron version:", argv.electronVersion);
-console.log("widevine support:", argv.widevine);
+console.log("widevine support:", widevine);
 console.log("services:", argv.services);
 console.log("internal urls:", argv.internalurls)
 console.log("no overwrite:", argv.noOverwrite);
 console.log("conceal:", argv.conceal);
 console.log("counter:", argv.counter);
 console.log("single instance:", argv.singleinstance)
-console.log("css/js injection:", inject);
-
-var npxnativefier = blankstr.concat("mkdir -p ~/appnativefy && cd ~/appnativefy && mkdir -p .appimage-temp", " ", favicongen, " && ", __dirname, "/node_modules/nativefier/lib/cli.js")
-
-///var commandvariable = npxnativefier.concat(" ", '"', url, '"', " ", "--name", " ", '"', name, '"', " ", widevine, " ", services, " ", singleinstance, " ", inject, " ");
-
-var commandvariable = npxnativefier.concat(" ", url, " ", "--name", " ", '"', name, '"', " ", icon, " ", appcopyright, " ", appversion, " ", electronversion, " ", downloaddialog, " ", widevine, " ", services, " ", internalurls, " ", nooverwrite, " ", conceal, " ", counter, " ", singleinstance, " ", inject, " ")
-
-console.log(commandvariable);
-
-var appimage = " rm style.css && rm -rf icon.png && "
-var appimagescript = appimage.concat(" sh script.sh", " ", name, " ")
-
-var almostfinalvar = commandvariable.concat('&&', appimagescript, ' && rm -r ~/appnativefy/.appimage-temp', ' && rm -r ~/appnativefy/script.sh ')
+console.log("css/js injection:", style);
+
+var options = {
+    name: name, // will be inferred if not specified
+    targetUrl: url, // required
+    platform: 'linux', // defaults to the current system
+    arch: 'x64', // defaults to the current system
+    version: appversion,
+    icon: customicon,
+    out: appnativefydir,
+    overwrite: overwrite,
+    asar: conceal, // see conceal
+    counter: counter,
+    bounce: false,
+    width: 1280,
+    height: 800,
+    showMenuBar: false,
+    fastQuit: false,
+    userAgent: services, // will infer a default for your current system
+    ignoreCertificate: false,
+    ignoreGpuBlacklist: false,
+    enableEs3Apis: false,
+    internalUrls: internalurls, // defaults to URLs on same second-level domain as app
+    blockExternalUrls: true,
+    insecure: false,
+    honest: honest,
+    widevine: widevine,
+    zoom: 1.0,
+    singleInstance: singleinstance,
+    verbose: true,
+    clearCache: false,
+    fileDownloadOptions: {
+        saveAs: downloaddialog, // always show "Save As" dialog
+    },
+};
+
+nativefier(options, function (error, appPath) {
+    if (error) {
+        console.error(error);
+        return;
+    }
+    console.log('App has been nativefied to', appPath);
+    var apptempdir = appnativefydir.concat("/.appimage-temp");
+    var appimagetooldir = appnativefydir.concat("/.appimagetool");
+
+    console.log(appnativefydir);
+    try {
+        if (!fs.existsSync(apptempdir)) {
+            fs.mkdirSync(apptempdir);
+        } else {
+        }
+    } catch (err) {
+        console.log(err);
 
-var downloads = blankstr.concat("mkdir -p ~/appnativefy && cd ~/appnativefy && mkdir -p .appimage-temp && cp", " ", __dirname, "/style.css style.css && cp", " ", __dirname, "/script.sh script.sh")
+    }
+    try {
+        if (!fs.existsSync(appimagetooldir)) {
+            fs.mkdirSync(appimagetooldir);          
+        } else {
+        }
+    } catch (err) {
+        console.log(err);
 
-var endofscript = blankstr.concat("echo ", '"', "AppImage built to ~/appnativefy/", name, "-x86_64.AppImage", '"')
+    }
+    var oldPath = appnativefydir.concat("/", name, "-linux-x64")
+    var newPath = apptempdir.concat("/", name, ".AppDir")
 
-var finalvar = blankstr.concat(downloads, " ", "&&", " ", almostfinalvar, " ", "&&", " ", endofscript)
+    fs.rename(oldPath, newPath, function (err) {
+        if (err) throw err
+        console.log('Successfully moved file.')
+    })
+    var scriptsource = blankstr.concat(__dirname, "/script.sh")
+    var scriptout = blankstr.concat(appnativefydir, "/.script.sh")
+    fs.copyFile(scriptsource, scriptout, (err) => {
+        if (err) throw err;
+        console.log(scriptsource, 'was copied to', scriptout);
+        process.chdir(appnativefydir);
+        commandscript = blankstr.concat("chmod 755 ~/appnativefy/.script.sh && ~/appnativefy/.script.sh", " ", name, " ", dirname, " ", "&& rm -rf ~/appnativefy/.script.sh && rm -rf ~/appnativefy/.icon.png")
+        {
+        exec(commandscript, (error, stdout, stderr) => {
+            if (error) {
+                console.log(`error: ${error.message}`);
+                return;
+            }
+            if (stderr) {
+                console.log(`stderr: ${stderr}`);
+                return;
+            }
+            console.log(`stdout: ${stdout}`);
+        });
+        };
+    });
+    
 
 
-exec(finalvar, (error, stdout, stderr) => {
-    if (error) {
-        console.log(`error: ${error.message}`);
-        return;
-    }
-    if (stderr) {
-        console.log(`stderr: ${stderr}`);
-        return;
-    }
-    console.log(`stdout: ${stdout}`);
 });
-
-var trueendofscript = blankstr.concat("AppImage building to ~/appnativefy/", name, "-x86_64.AppImage")
-console.log(trueendofscript);