Merge pull request #1 from GitSquared/master

Merge new commits.

Author: Lucas Malandrino

README.md

@@ -9,10 +9,14 @@ Download | Linux & macOS | Windows | Dependencies | Build system | Source
 -------- | ------------- | ------- | ------------ | ------------ | ------
 [![Release Badge](https://badgen.net/github/release/GitSquared/edex-ui)](https://github.com/GitSquared/edex-ui/releases) | [![Build Status](https://travis-ci.org/GitSquared/edex-ui.svg?branch=master)](https://travis-ci.org/GitSquared/edex-ui) | [![Build status](https://ci.appveyor.com/api/projects/status/leb069bro8gwocu7/branch/master?svg=true)](https://ci.appveyor.com/project/GitSquared/edex-ui/branch/master) | [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=GitSquared/edex-ui)](https://dependabot.com) | [![Known Vulnerabilities](https://snyk.io/test/github/GitSquared/edex-ui/badge.svg?targetFile=package.json)](https://snyk.io/test/github/GitSquared/edex-ui?targetFile=package.json) | [![Known Vulnerabilities](https://snyk.io/test/github/GitSquared/edex-ui/badge.svg?targetFile=src%2Fpackage.json)](https://snyk.io/test/github/GitSquared/edex-ui?targetFile=src%2Fpackage.json)
 
+Download 1.0.1: [for Windows](https://github.com/GitSquared/edex-ui/releases/download/v1.1.0/eDEX-UI.Windows.Installer.exe) | [for macOS](https://github.com/GitSquared/edex-ui/releases/download/v1.1.0/eDEX-UI.MacOS.Image.dmg) | [for Linux x32](https://github.com/GitSquared/edex-ui/releases/download/v1.1.0/eDEX-UI.Linux.i386.AppImage) | [for Linux x64](https://github.com/GitSquared/edex-ui/releases/download/v1.1.0/eDEX-UI.Linux.x86_64.AppImage)
+
 eDEX-UI is a fullscreen desktop application resembling a sci-fi computer interface, heavily inspired from [DEX-UI](https://github.com/seenaburns/dex-ui) and the [TRON Legacy movie effects](https://web.archive.org/web/20170511000410/http://jtnimoy.com/blogs/projects/14881671). It runs the shell of your choice in a real terminal, and displays live information about your system. It was made to be used on large touchscreens but will work nicely on a regular desktop computer or perhaps a tablet PC or one of those funky 360° laptops with touchscreens.
 
 I had no ideas for a name so i took DEX-UI and added a "e" for Electron. Deal with it.
 
+([Official ArchLinux AUR package](https://aur.archlinux.org/packages/edex-ui/) maintained by [@JesusCrie](https://github.com/JesusCrie))
+
 ## Screenshots
 ![Default screenshot](https://github.com/GitSquared/edex-ui/raw/master/media/screenshot_default.png)
 
@@ -38,17 +42,28 @@ eDEX-UI is meant to be used on touchscreens, even if it works well on regular di
 #### What's the difference between this and the original DEX-UI?
 Seenaburns' DEX-UI was created _"as an experiment or an art piece, not distributable software"_. The goal of this project is to push Seena's vision forward by making such an interface usable in real-life scenarios.
 #### Will using this make me insanely badass?
-[Yes.](https://78.media.tumblr.com/35d4ef4447e0112f776b629bffd99188/tumblr_mk4gf8zvyC1s567uwo1_500.gif)
+Yes.
+
+<img width="220" src="https://78.media.tumblr.com/35d4ef4447e0112f776b629bffd99188/tumblr_mk4gf8zvyC1s567uwo1_500.gif" />
 
 
 ## Featured in...
 - [Linux Uprising Blog](https://www.linuxuprising.com/2018/11/edex-ui-fully-functioning-sci-fi.html)
 - [My post on r/unixporn](https://www.reddit.com/r/unixporn/comments/9ysbx7/oc_a_little_project_that_ive_been_working_on/)
 - [Korben article (in french)](https://korben.info/une-interface-futuriste-pour-vos-ecrans-tactiles.html)
+- [Hacker News](https://news.ycombinator.com/item?id=18509828)
+- [This tweet that made me smile](https://twitter.com/mikemaccana/status/1065615451940667396)
+- [BoingBoing article](https://boingboing.net/2018/11/23/simulacrum-sf.html) - Apparently i'm a "French hacker" lol
+- [OReilly 4 short links](https://www.oreilly.com/ideas/four-short-links-23-november-2018)
+- [Hackaday](https://hackaday.com/2018/11/23/look-like-a-movie-hacker/)
+- [Developpez.com (another french link)](https://www.developpez.com/actu/234808/Une-application-de-bureau-ressemble-a-une-interface-d-ordinateur-de-science-fiction-inspiree-des-effets-du-film-TRON-Legacy/)
 
 
 ## Useful commands for the nerds
 #### Starting from source:
+
+**IMPORTANT NOTE:** the following instructions are meant **for DEVELOPERS ONLY**. If you're just a casual user please download the precompiled binaries available on the [Releases tab](https://github.com/GitSquared/edex-ui/releases).
+
 on *nix systems (You'll need the Xcode command line tools on macOS):
 - clone the repository
 - `npm run install-linux`

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "edex-ui",
   "productName": "eDEX-UI",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "A science fiction desktop running everywhere. Awesome.",
   "keywords": [
     "desktop",
@@ -26,7 +26,8 @@
     "postbuild-linux": "rm -R prebuild-src",
     "postbuild-darwin": "rm -R prebuild-src",
     "postbuild-windows": "rmdir /S /Q prebuild-src",
-    "snyk-protect": "snyk protect"
+    "snyk-protect": "snyk protect",
+    "test": "rsync -a --info=progress2 src prebuild-src --exclude node_modules && node prebuild-minify.js && rm -R prebuild-src"
   },
   "repository": {
     "type": "git",
@@ -107,8 +108,8 @@
     "electron-rebuild": "1.8.2",
     "node-abi": "2.5.0",
     "node-json-minify": "1.0.0",
-    "snyk": "^1.108.2",
-    "uglify-es": "3.3.10"
+    "snyk": "^1.110.2",
+    "uglify-es": "3.3.9"
   },
   "snyk": true
 }

package.json

@@ -5,7 +5,14 @@ process.on("uncaughtException", e => {
     signale.fatal(e);
     dialog.showErrorBox("eEDEX-UI failed to launch", e.message || "Cannot retrieve error message.");
     if (tty) {
-        tty.tty.kill();
+        tty.close();
+    }
+    if (extraTtys) {
+        Object.keys(extraTtys).forEach(key => {
+            if (extraTtys[key] !== null) {
+                extraTtys[key].close();
+            }
+        });
     }
 });
 
@@ -26,7 +33,7 @@ ipc.on("log", (e, type, content) => {
     signale[type](content);
 });
 
-var win, tty;
+var win, tty, extraTtys;
 const settingsFile = path.join(electron.app.getPath("userData"), "settings.json");
 const themesDir = path.join(electron.app.getPath("userData"), "themes");
 const innerThemesDir = path.join(__dirname, "assets/themes");
@@ -80,7 +87,14 @@ fs.readdirSync(innerFontsDir).forEach((e) => {
 
 function createWindow(settings) {
     signale.info("Creating window...");
-    let {x, y, width, height} = electron.screen.getPrimaryDisplay().bounds;
+
+    let display;
+    if (!isNaN(settings.monitor)) {
+        display = electron.screen.getAllDisplays()[settings.monitor] || electron.screen.getPrimaryDisplay();
+    } else {
+        display = electron.screen.getPrimaryDisplay();
+    }
+    let {x, y, width, height} = display.bounds;
     width++; height++;
     win = new BrowserWindow({
         title: "eDEX-UI",
@@ -129,7 +143,8 @@ app.on('ready', () => {
     signale.pending(`Creating new terminal process on port ${settings.port || '3000'}`);
     tty = new Terminal({
         role: "server",
-        shell: settings.shell,
+        shell: settings.shell.split(" ")[0],
+        params: settings.shell.split(" ").splice(1),
         cwd: settings.cwd,
         port: settings.port || 3000
     });
@@ -165,6 +180,61 @@ app.on('ready', () => {
     });
 
     createWindow(settings);
+
+    // Support for more terminals, used for creating tabs (currently limited to 4 extra terms)
+    extraTtys = {};
+    let basePort = settings.port || 3000;
+    basePort = Number(basePort) + 2;
+
+    for (let i = 0; i < 4; i++) {
+        extraTtys[basePort+i] = null;
+    }
+
+    ipc.on("ttyspawn", (e, arg) => {
+        let port = null;
+        Object.keys(extraTtys).forEach(key => {
+            if (extraTtys[key] === null && port === null) {
+                extraTtys[key] = {};
+                port = key;
+            }
+        });
+
+        if (port === null) {
+            signale.error("TTY spawn denied (Reason: exceeded max TTYs number)");
+            e.sender.send("ttyspawn-reply", "ERROR: max number of ttys reached");
+        } else {
+            signale.pending(`Creating new TTY process on port ${port}`);
+            let term = new Terminal({
+                role: "server",
+                shell: settings.shell.split(" ")[0],
+                params: settings.shell.split(" ").splice(1),
+                cwd: tty.tty._cwd || settings.cwd,
+                port: port
+            });
+            signale.success(`New terminal back-end initialized at ${port}`);
+            term.onclosed = (code, signal) => {
+                term.ondisconnected = () => {};
+                term.wss.close();
+                signale.complete(`TTY exited at ${port}`, code, signal);
+                extraTtys[term.port] = null;
+                delete term;
+            };
+            term.onopened = () => {
+                signale.success(`TTY ${port} connected to frontend`);
+            };
+            term.onresized = () => {};
+            term.ondisconnected = () => {
+                term.onclosed = () => {};
+                term.close();
+                term.wss.close();
+                extraTtys[term.port] = null;
+                delete term;
+            };
+
+            extraTtys[port] = term;
+            e.sender.send("ttyspawn-reply", "SUCCESS: "+port);
+        }
+    });
 });
 
 app.on('web-contents-created', (e, contents) => {
@@ -185,6 +255,11 @@ app.on('window-all-closed', () => {
 });
 
 app.on('before-quit', () => {
-    tty.tty.kill();
+    tty.close();
+    Object.keys(extraTtys).forEach(key => {
+        if (extraTtys[key] !== null) {
+            extraTtys[key].close();
+        }
+    });
     signale.complete("Shutting down...");
 });