reconfigure terminals on DPI change (fixes #576)

Update windows-swca dependency

.gitignore

@@ -5,6 +5,7 @@ node_modules
 
 build/files.wxs
 dist
+*/dist
 
 *.xcworkspacedata
 *.xcuserstate

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     env: BUILD_FOR=macos
 
 language: node_js
-node_js: 8
+node_js: 10
 
 cache:
   directories:
@@ -14,8 +14,7 @@ cache:
     - app/node_modules
 
 before_install:
-    - yarn install
+    - yarn
-    - scripts/install-deps.js
 
 script:
     - scripts/build-native.js

README.md

@@ -6,7 +6,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/Eugeny/terminus/releases/latest">Downloads</a> | <a href="https://t.me/joinchat/AAAAAEZuCv2WKKYcfyQ3QA">Community</a>  | <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts">Latest Windows nightly</a>
+  <a href="https://github.com/Eugeny/terminus/releases/latest">Downloads</a> | <a href="https://t.me/joinchat/HgLqPhRg9Inhmm7WD3H1BQ">Community</a>  | <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts">Latest Windows nightly</a>
 </p>
 
 ----
@@ -19,8 +19,9 @@
   * Full Unicode support including double-width characters
   * Doesn't choke on fast-flowing outputs
   * Proper shell-like experience on Windows including tab completion (via Clink)
-  * PowerShell Core, WSL (Bash on Windows), PowerShell, Git-Bash, Cygwin, Cmder and CMD support
+  * PowerShell (+Core), WSL (Bash on Windows), Git-Bash, Cygwin, Cmder and CMD support
-  * Tab persistence on macOS and Linux
+  * Remembers your tabs
+  * Integrated SSH client and connection manager
 
 
 [![Buy me a coffee](https://github.com/Eugeny/terminus/raw/master/docs/kofi.png)](https://ko-fi.com/eugeny)
@@ -38,6 +39,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
   * [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
   * [scrollbar](https://github.com/kbjr/terminus-scrollbar) - adds a scrollbar to terminal tabs
   * [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - quickly send commands to one or all terminal tabs
+  * [save-output](https://github.com/Eugeny/terminus-save-output) - record terminal output into a file
 
 ---
 

app/lib/app.ts

@@ -1,4 +1,5 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
+import * as electron from 'electron'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
 
@@ -18,6 +19,11 @@ export class Application {
         }
 
         app.commandLine.appendSwitch('disable-http-cache')
+        app.commandLine.appendSwitch('lang', 'EN')
+    }
+
+    init () {
+        electron.screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))        
     }
 
     async newWindow (options?: WindowOptions): Promise<Window> {
@@ -103,7 +109,7 @@ export class Application {
                     {
                         label: 'Preferences',
                         accelerator: 'Cmd+,',
-                        async click () {
+                        click: async () => {
                             if (!this.hasWindows()) {
                                 await this.newWindow()
                             }

app/lib/cli.ts

@@ -13,6 +13,9 @@ export function parseArgs (argv, cwd) {
         .command('run [command...]', 'run a command in the terminal', {
             command: { type: 'string' },
         })
+        .command('profile [profileName]', 'open a tab with specified profile', {
+            profileName: { type: 'string' },
+        })
         .command('paste [text]', 'paste stdin into the active tab', yargs => {
             return yargs.option('escape', {
                 alias: 'e',

app/lib/index.ts

@@ -12,7 +12,6 @@ if (!process.env.TERMINUS_PLUGINS) {
 const application = new Application()
 
 ipcMain.on('app:new-window', () => {
-    console.log('new-window')
     application.newWindow()
 })
 
@@ -59,5 +58,6 @@ app.on('ready', () => {
             }
         ]))
     }
+    application.init()
     application.newWindow({ hidden: argv.hidden })
 })

app/lib/window.ts

@@ -1,4 +1,5 @@
 import { Subject, Observable } from 'rxjs'
+import { debounceTime } from 'rxjs/operators'
 import { BrowserWindow, app, ipcMain, Rectangle } from 'electron'
 import ElectronConfig = require('electron-config')
 import * as os from 'os'
@@ -10,7 +11,7 @@ let AccentState: any
 let DwmEnableBlurBehindWindow: any
 if (process.platform === 'win32') {
     SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute
-    AccentState = require('windows-swca').AccentState
+    AccentState = require('windows-swca').ACCENT_STATE
     DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
@@ -102,16 +103,14 @@ export class Window {
         if (process.platform === 'win32') {
             if (parseFloat(os.release()) >= 10) {
                 let attribValue = AccentState.ACCENT_DISABLED
-                let color = 0x00000000
                 if (enabled) {
                     if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
-                        attribValue = AccentState.ACCENT_ENABLE_FLUENT
+                        attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
-                        color = 0x01000000 // using a small alpha because acrylic bugs out at full transparency.
                     } else {
                         attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
                     }
                 }
-                SetWindowCompositionAttribute(this.window, attribValue, color)
+                SetWindowCompositionAttribute(this.window.getNativeWindowHandle(), attribValue, 0x00000000)
             } else {
                 DwmEnableBlurBehindWindow(this.window, enabled)
             }
@@ -143,6 +142,16 @@ export class Window {
             this.visible.next(false)
         })
 
+        let moveSubscription = new Observable<void>(observer => {
+            this.window.on('move', () => observer.next())
+        }).pipe(debounceTime(250)).subscribe(() => {
+            this.window.webContents.send('host:window-moved')
+        })
+
+        this.window.on('closed', () => {
+            moveSubscription.unsubscribe()
+        })
+
         this.window.on('enter-full-screen', () => this.window.webContents.send('host:window-enter-full-screen'))
         this.window.on('leave-full-screen', () => this.window.webContents.send('host:window-leave-full-screen'))
 
@@ -173,28 +182,28 @@ export class Window {
         })
 
         ipcMain.on('window-focus', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.focus()
         })
 
         ipcMain.on('window-maximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.maximize()
         })
 
         ipcMain.on('window-unmaximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.unmaximize()
         })
 
         ipcMain.on('window-toggle-maximize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             if (this.window.isMaximized()) {
@@ -205,42 +214,42 @@ export class Window {
         })
 
         ipcMain.on('window-minimize', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.minimize()
         })
 
         ipcMain.on('window-set-bounds', (event, bounds) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setBounds(bounds)
         })
 
         ipcMain.on('window-set-always-on-top', (event, flag) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setAlwaysOnTop(flag)
         })
 
         ipcMain.on('window-set-vibrancy', (event, enabled, type) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.setVibrancy(enabled, type)
         })
 
         ipcMain.on('window-set-title', (event, title) => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             this.window.setTitle(title)
         })
 
         ipcMain.on('window-bring-to-front', event => {
-            if (event.sender !== this.window.webContents) {
+            if (!this.window || event.sender !== this.window.webContents) {
                 return
             }
             if (this.window.isMinimized()) {
@@ -250,7 +259,10 @@ export class Window {
             this.window.moveTop()
         })
 
-        ipcMain.on('window-close', () => {
+        ipcMain.on('window-close', event => {
+            if (!this.window || event.sender !== this.window.webContents) {
+                return
+            }
             this.closing = true
             this.window.close()
         })

app/package.json

@@ -13,13 +13,13 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "7.0.0",
+    "@angular/animations": "7.2.0-rc.0",
-    "@angular/common": "7.0.0",
+    "@angular/common": "7.2.0-rc.0",
-    "@angular/compiler": "7.0.0",
+    "@angular/compiler": "7.2.0-rc.0",
-    "@angular/core": "7.0.0",
+    "@angular/core": "7.2.0-rc.0",
-    "@angular/forms": "7.0.0",
+    "@angular/forms": "7.2.0-rc.0",
-    "@angular/platform-browser": "7.0.0",
+    "@angular/platform-browser": "7.2.0-rc.0",
-    "@angular/platform-browser-dynamic": "7.0.0",
+    "@angular/platform-browser-dynamic": "7.2.0-rc.0",
     "@ng-bootstrap/ng-bootstrap": "^3.3.1",
     "devtron": "1.4.0",
     "electron-config": "0.2.1",
@@ -36,7 +36,7 @@
   },
   "optionalDependencies": {
     "windows-blurbehind": "^1.0.0",
-    "windows-swca": "^1.1.1"
+    "windows-swca": "^2.0.1"
   },
   "devDependencies": {
     "@types/mz": "0.0.31"

app/src/entry.preload.ts

@@ -1,7 +1,9 @@
 import '../lib/lru'
 import 'source-sans-pro'
 import 'source-code-pro/source-code-pro.css'
-import 'font-awesome/css/font-awesome.css'
+import '@fortawesome/fontawesome-free/css/solid.css'
+import '@fortawesome/fontawesome-free/css/brands.css'
+import '@fortawesome/fontawesome-free/css/fontawesome.css'
 import 'ngx-toastr/toastr.css'
 import './preload.scss'
 

app/src/entry.ts

@@ -15,6 +15,8 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 import { getRootModule } from './app.module'
 import { findPlugins, loadPlugins, IPluginInfo } from './plugins'
 
+;(process as any).enablePromiseAPI = true
+
 if (process.platform === 'win32') {
     process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH
 }
@@ -34,7 +36,7 @@ async function bootstrap (plugins: IPluginInfo[], safeMode = false): Promise<NgM
     })
     let module = getRootModule(pluginsModules)
     window['rootModule'] = module
-    return await platformBrowserDynamic().bootstrapModule(module)
+    return platformBrowserDynamic().bootstrapModule(module)
 }
 
 findPlugins().then(async plugins => {

app/src/plugins.ts

@@ -16,11 +16,11 @@ function normalizePath (path: string): string {
 
 nodeRequire.main.paths.map(x => nodeModule.globalPaths.push(normalizePath(x)))
 
-if (process.env.DEV) {
+if (process.env.TERMINUS_DEV) {
     nodeModule.globalPaths.unshift(path.dirname(require('electron').remote.app.getAppPath()))
 }
 
-const builtinPluginsPath = process.env.DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
+const builtinPluginsPath = process.env.TERMINUS_DEV ? path.dirname(require('electron').remote.app.getAppPath()) : path.join((process as any).resourcesPath, 'builtin-plugins')
 
 const userPluginsPath = path.join(
     require('electron').remote.app.getPath('appData'),
@@ -118,7 +118,7 @@ export async function findPlugins (): Promise<IPluginInfo[]> {
         }
 
         try {
-            let info = JSON.parse(await fs.readFile(infoPath, {encoding: 'utf-8'}))
+            let info = JSON.parse(await fs.readFile(infoPath, { encoding: 'utf-8' }))
             if (!info.keywords || !(info.keywords.includes('terminus-plugin') || info.keywords.includes('terminus-builtin-plugin'))) {
                 continue
             }

app/tsconfig.json

@@ -9,7 +9,6 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "sourceMap": true,
-        "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "noUnusedParameters": true,

app/webpack.config.js

@@ -9,7 +9,7 @@ module.exports = {
     preload: path.resolve(__dirname, 'src/entry.preload.ts'),
     bundle: path.resolve(__dirname, 'src/entry.ts'),
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },

app/webpack.main.config.js

@@ -7,7 +7,7 @@ module.exports = {
   entry: {
     main: path.resolve(__dirname, 'lib/index.ts'),
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   context: __dirname,
   devtool: 'source-map',
   output: {

app/yarn.lock

@@ -2,52 +2,52 @@
 # yarn lockfile v1
 
 
-"@angular/animations@7.0.0":
+"@angular/animations@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0.tgz#5c9e1683063c29df10253b7dc5bb9b13694ee396"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.0-rc.0.tgz#12849f8ab104d309ec99c0ceb170a895c15d3d44"
-  integrity sha512-IYdryQXdYfPvhJpExLSAr0o9rlUeyVS++a6h/sjqN1dkUt/yJBHLRreuHx8Udvlj2nH70raHJgevk8FwhAkTdA==
+  integrity sha512-CRQNQ6QVTuf4nCHVLVpKQx7YPpNPfnTF79KVWzHefkkyS3URRuEgvE4jCED4oTJ4BEsmkjXyt51VeDV0FgqQFg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/common@7.0.0":
+"@angular/common@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0.tgz#29206614d2b8dc79e5207b7dc6f9fc559e9a24f2"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.0-rc.0.tgz#60d3540c6cdcf3440f67e2c15cf8f1c7b1160d9d"
-  integrity sha512-jp6MA6EOq/a1m+F0c1aZC345pAYYYFpN1m7GMM91JlqkjzJMhyYVk+Bod9xQOEWadcpY+RFudG+jRsPCMO8bvQ==
+  integrity sha512-Xv60KEP1kpF74kpN1xtps0W++PUXLUMK/0tDblUZH7tBWvS0XwEwtuK5B6wcs+I5nqZkPgvlvOyiVZvOLraWOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler@7.0.0":
+"@angular/compiler@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0.tgz#f953a213a01e4736e94fe1a370b07e13e2393b71"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.0-rc.0.tgz#603dbec25d6c2beea08a293c68c39b40e2ea81e2"
-  integrity sha512-4fkohfGyG1BEpeYenOartuJmduyZ/R3XQx46hDDiR/9A8/Go4qLGkgr9Bd/JL/gPIR1XAHH9D5ii2sh+28ZEmA==
+  integrity sha512-tvgGJx0urSz/qn6upmcjX3N3dyWQ9m5mQOwJxmN4qekxjOtSRml5yt2KtlaUTkGsjkEmEVfSHel+X1TwzBdhYw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@7.0.0":
+"@angular/core@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0.tgz#01e9db9074a1db1c47a32f745b787d1c86f5d61a"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.0-rc.0.tgz#57c0e26130288c3b58466f079828c028bdf6221f"
-  integrity sha512-DjVyWNGBWKEeBvxeXy8FGBNlnr/W/tNygOZEd6/uCktcXTG4DNyNQrWuNZUKEpr7RuIT3YVMj+UNwgTq0jB/9g==
+  integrity sha512-2u11TNlLorw3JhuczCPwl8UmxE+ja2Q/ghBl8iYi4SIBWiBO1K0wVT13Ts7eojk63yZcg60lyYYCegXBmHLTuw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@7.0.0":
+"@angular/forms@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.0.0.tgz#672c306b13e94a20b72c096214642a326c43699a"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.0-rc.0.tgz#4eb473018084bb81be3e2e1ae8afa8d2b2117a6c"
-  integrity sha512-rTg1UHq9gHR6zY3Kkip1KCm/YTck/rlR8CvVFIMwF0bdQxUCT51SXVn58nXts9yDaieABcGaQHNkQn1mARslgw==
+  integrity sha512-OWP1zzYQiuqtoltdlhkcVjHxg78exbt7z1lr8RSjybr/Snc5zSFhnZF6byasd/4lzVySuujsMXkTK7D8x6hedA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@7.0.0":
+"@angular/platform-browser-dynamic@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0.tgz#2b2a50b5a8176bee257f90ee47b1d873502f7182"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.0-rc.0.tgz#5ea47d094c53a0ba34ecbb0dfdcef452fa05dc9a"
-  integrity sha512-lH2KuH+Em1y/mTOE6yTJmsOxYkMbYKzKLP9gYzc9vZu3er1df6Jx6jxefeBmAr9v+kNCLnpnHWHz2y4GzAesJA==
+  integrity sha512-uqT27oh9m58L6MUjgvT+7NpAFbigOnnTUWMsCLijNUKd7i37T6UxTVKPvuqNHlaLXsmDRxVHN3INI0IrWZ3R+w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@7.0.0":
+"@angular/platform-browser@7.2.0-rc.0":
-  version "7.0.0"
+  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0.tgz#8c13a6380cf465b3628e5b576a1313e9b4976093"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.0-rc.0.tgz#c6d1f0b2328b1d81649bea70c23edc33de729015"
-  integrity sha512-XyvL30d6meJ+SXlOmdR+sxoLdSvkQdmVNvpdvUzAHC/EqwA/byg4V3bTe5lpZmypclgFCjkGoTsz6uOnnwlQhw==
+  integrity sha512-r0ak7SVLWrivd4S0MXWmqNLeF6NNOBAopnjrhUu2j5I00u7/QfLrX0E5zRlJ8JkARVjer6Wm+D1ztlOWw5jHag==
   dependencies:
     tslib "^1.9.0"
 
@@ -70,6 +70,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.13.tgz#530f0f9254209b0335bf5cc6387822594ef47093"
   integrity sha512-Y3EAG7VA7NVNbZek/fjJtILnmTk/ZfpJuWZGDBqDZ1dVIxgJJJ82fXPW7pKnqyV9CD/9bcPOCi7eErUqGMHOrA==
 
+"@types/node@^10.12.18":
+  version "10.12.18"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
+  integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
+
 accessibility-developer-tools@^2.11.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
@@ -620,10 +625,12 @@ windows-blurbehind@^1.0.0:
   resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.0.tgz#050efb988704c44335bdc3efefd757f6e463b8ac"
   integrity sha512-lO+A7fhTHO7oy9zJM3o1AdzfSQrmtPkdwvleeuww840ghijjEA1f1Zp8bKA3mJu2DFNtVT40fwmqtgsCGat4UA==
 
-windows-swca@^1.1.1:
+windows-swca@^2.0.1:
-  version "1.1.1"
+  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-1.1.1.tgz#0b3530278c67d408baac71c3a6aeb16d55318bf8"
+  resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.1.tgz#25d78ce25251292061494a0ad07c02282b28b4e3"
-  integrity sha512-hKmHrNYJD72Kg0u35fjkiFIuMKuC+Tztmf3Obnf4aTkNjstEpbSEspEeSo3ZNixaVCETA1dLbDkVUQVF1QxtWA==
+  integrity sha512-flj+HD6RUemZUvKKguLLnMUOYkQSgDu9qrhUIO4cydvtb/x+sxU8XmpZUtugYuydcdikB9zsCOMgKnAqIQ+7nw==
+  dependencies:
+    "@types/node" "^10.12.18"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"

appveyor.yml

@@ -7,18 +7,18 @@ environment:
   nodejs_version: "10"
 
 cache:
-  - '%USERPROFILE%\.electron'
+  - "%USERPROFILE%\\.electron"
+  - "%LOCALAPPDATA%\\Yarn"
 
 version: "{build}"
 
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
-  - npm install
+  - yarn
-  - node scripts/install-deps.js
   - node scripts/build-native.js
 
 build_script:
-  - npm run build
+  - yarn run build
   - node scripts/prepackage-plugins.js
   - node scripts/build-windows.js
 

package.json

@@ -1,6 +1,7 @@
 {
   "name": "term",
   "devDependencies": {
+    "@fortawesome/fontawesome-free": "^5.6.3",
     "@types/electron-config": "^0.2.1",
     "@types/electron-debug": "^1.1.0",
     "@types/fs-promise": "1.0.1",
@@ -13,20 +14,17 @@
     "core-js": "2.4.1",
     "cross-env": "4.0.0",
     "css-loader": "0.28.0",
-    "electron": "4.0.0-beta.8",
+    "electron": "4.0.0",
-    "electron-builder": "^20.38.2",
+    "electron-builder": "^20.38.4",
     "electron-builder-squirrel-windows": "^20.28.3",
     "electron-installer-snap": "^3.0.0",
     "electron-rebuild": "^1.8.2",
     "file-loader": "^1.1.11",
-    "font-awesome": "4.7.0",
     "graceful-fs": "^4.1.11",
     "html-loader": "0.4.4",
     "json-loader": "0.5.4",
-    "less": "2.7.1",
-    "less-loader": "2.2.3",
     "node-abi": "^2.4.4",
-    "node-gyp": "^3.6.2",
+    "node-gyp": "^3.8.0",
     "node-sass": "^4.5.3",
     "npmlog": "4.1.0",
     "npx": "^10.2.0",
@@ -44,17 +42,20 @@
     "style-loader": "0.13.1",
     "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.5",
-    "tslint": "5.1.0",
+    "tslint": "^5.12.0",
-    "tslint-config-standard": "5.0.2",
+    "tslint-config-standard": "^8.0.1",
-    "tslint-eslint-rules": "4.0.0",
+    "tslint-eslint-rules": "^5.4.0",
     "typescript": "^3.1.3",
     "url-loader": "^1.1.1",
     "val-loader": "0.5.0",
-    "webpack": "^4.22.0",
+    "webpack": "^4.27.1",
     "webpack-cli": "^3.1.2",
     "yaml-loader": "0.4.0",
     "yarn": "^1.10.1"
   },
+  "resolutions": {
+    "*/node-abi": "^2.5.0"
+  },
   "build": {
     "appId": "org.terminus",
     "productName": "Terminus",
@@ -76,6 +77,7 @@
     },
     "squirrelWindows": {
       "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico",
+      "loadingGif": "./build/windows/squirrel.gif",
       "artifactName": "terminus-${version}-setup.exe"
     },
     "portable": {
@@ -84,6 +86,7 @@
     "mac": {
       "category": "public.app-category.video",
       "icon": "./build/mac/icon.icns",
+      "artifactName": "terminus-${version}-macos.${ext}",
       "publish": [
         "github"
       ],
@@ -124,11 +127,11 @@
   },
   "scripts": {
     "build": "webpack --color --config app/webpack.main.config.js && webpack --color --config app/webpack.config.js && webpack --color --config terminus-core/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-terminal/webpack.config.js && webpack --color --config terminus-settings/webpack.config.js && webpack --color --config terminus-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
-    "watch": "cross-env DEV=1 webpack --progress --color --watch",
+    "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch",
-    "start": "cross-env DEV=1 electron app --debug",
+    "start": "cross-env TERMINUS_DEV=1 electron app --debug",
-    "prod": "cross-env DEV=1 electron app",
+    "prod": "cross-env TERMINUS_DEV=1 electron app",
     "lint": "tslint -c tslint.json -t stylish terminus-*/src/**/*.ts terminus-*/src/*.ts app/src/*.ts",
-    "postinstall": "install-app-deps"
+    "postinstall": "node ./scripts/install-deps.js"
   },
   "repository": "eugeny/terminus"
 }

scripts/build-native.js

@@ -4,24 +4,18 @@ const path = require('path')
 const vars = require('./vars')
 
 lifecycles = []
-lifecycles.push(rebuild({
+for (let dir of ['app', 'terminus-ssh', 'terminus-terminal']) {
-  buildPath: path.resolve(__dirname, '../app'),
+  lifecycles.push([rebuild({
-  electronVersion: vars.electronVersion,
+    buildPath: path.resolve(__dirname, '../' + dir),
-  force: true,
+    electronVersion: vars.electronVersion,
-}).lifecycle)
+    force: true,
-lifecycles.push(rebuild({
+  }).lifecycle, dir])
-  buildPath: path.resolve(__dirname, '../terminus-ssh'),
+}
-  electronVersion: vars.electronVersion,
-  force: true,
-}).lifecycle)
-lifecycles.push(rebuild({
-  buildPath: path.resolve(__dirname, '../terminus-terminal'),
-  electronVersion: vars.electronVersion,
-  force: true,
-}).lifecycle)
 
-for (let lc of lifecycles) {
+console.info('Building against Electron', vars.electronVersion)
+
+for (let [lc, dir] of lifecycles) {
   lc.on('module-found', name => {
-    console.info('Rebuilding', name)
+    console.info('Rebuilding', dir + '/' + name)
   })
 }

scripts/install-deps.js

@@ -8,7 +8,6 @@ const localBinPath = path.resolve(__dirname, '../node_modules/.bin');
 const npx = `${localBinPath}/npx`;
 
 log.info('deps', 'app')
-sh.exec(`${npx} yarn install`)
 
 sh.cd('app')
 sh.exec(`${npx} yarn install`)

scripts/vars.js

@@ -3,10 +3,11 @@ const fs = require('fs')
 const childProcess = require('child_process')
 
 const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/package.json')))
-const pkgInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')))
+const electronInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../node_modules/electron/package.json')))
 
 exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'})
-exports.version = exports.version.substring(1, exports.version.length - 1)
+exports.version = exports.version.substring(1).trim()
+exports.version = exports.version.replace('-', '-c')
 
 exports.builtinPlugins = [
   'terminus-core',
@@ -20,4 +21,4 @@ exports.bundledModules = [
   '@angular',
   '@ng-bootstrap',
 ]
-exports.electronVersion = pkgInfo.devDependencies.electron
+exports.electronVersion = electronInfo.version

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.68-c17-g8b64a81",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"

terminus-community-color-schemes/webpack.config.js

@@ -13,7 +13,7 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]',
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.68-c17-g8b64a81",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -27,7 +27,7 @@
     "electron-updater": "^2.8.9",
     "ng2-dnd": "^5.0.2",
     "ngx-perfect-scrollbar": "^6.0.0",
-    "rage-edit-tmp": "^1.1.0",
+    "rage-edit": "^1.2.0",
     "shell-escape": "^0.2.0",
     "universal-analytics": "^0.4.17"
   },

terminus-core/src/api/index.ts

@@ -4,6 +4,7 @@ export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'
 export { Theme } from './theme'
+export { TabContextMenuItemProvider } from './tabContextMenuProvider'
 
 export { AppService } from '../services/app.service'
 export { ConfigService } from '../services/config.service'

terminus-core/src/api/tabContextMenuProvider.ts

@@ -0,0 +1,8 @@
+import { BaseTabComponent } from '../components/baseTab.component'
+import { TabHeaderComponent } from '../components/tabHeader.component'
+
+export abstract class TabContextMenuItemProvider {
+    weight = 0
+
+    abstract async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]>
+}

terminus-core/src/api/tabRecovery.ts

@@ -6,5 +6,5 @@ export interface RecoveredTab {
 }
 
 export abstract class TabRecoveryProvider {
-    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
+    abstract async recover (recoveryToken: any): Promise<RecoveredTab | null>
 }

terminus-core/src/components/appRoot.component.ts

@@ -9,7 +9,6 @@ import { HotkeysService } from '../services/hotkeys.service'
 import { Logger, LogService } from '../services/log.service'
 import { ConfigService } from '../services/config.service'
 import { DockingService } from '../services/docking.service'
-import { TabRecoveryService } from '../services/tabRecovery.service'
 import { ThemesService } from '../services/themes.service'
 import { UpdaterService } from '../services/updater.service'
 import { TouchbarService } from '../services/touchbar.service'
@@ -69,7 +68,6 @@ export class AppRootComponent {
     constructor (
         private docking: DockingService,
         private electron: ElectronService,
-        private tabRecovery: TabRecoveryService,
         private hotkeys: HotkeysService,
         private updater: UpdaterService,
         private touchbar: TouchbarService,
@@ -199,9 +197,7 @@ export class AppRootComponent {
     }
 
     async ngOnInit () {
-        await this.tabRecovery.recoverTabs()
         this.ready = true
-        this.tabRecovery.saveTabs(this.app.tabs)
 
         this.app.emitReady()
     }

terminus-core/src/components/baseTab.component.ts

@@ -69,7 +69,7 @@ export abstract class BaseTabComponent {
         this.activity.next(false)
     }
 
-    getRecoveryToken (): any {
+    async getRecoveryToken (): Promise<any> {
         return null
     }
 

terminus-core/src/components/checkbox.component.pug

@@ -1,4 +1,4 @@
 .icon(tabindex='0', [class.active]='model', (keyup.space)='click()')
-    i.fa.fa-square-o.off
+    i.fas.fa-square.off
-    i.fa.fa-check-square.on
+    i.fas.fa-check-square.on
 .text {{text}}

terminus-core/src/components/checkbox.component.scss

@@ -20,6 +20,10 @@
     flex-direction: row;
     align-items: center;
 
+    .off {
+        color: rgba(0, 0, 0, .5);
+    }
+
     .icon {
         position: relative;
         flex: none;

terminus-core/src/components/renameTabModal.component.ts

@@ -16,6 +16,7 @@ export class RenameTabModalComponent {
     ngOnInit () {
         setTimeout(() => {
             this.input.nativeElement.focus()
+            this.input.nativeElement.select()
         }, 250)
     }
 

terminus-core/src/components/startPage.component.pug

@@ -14,10 +14,10 @@ div
 footer.d-flex.align-items-center
     .btn-group.mr-auto
         button.btn.btn-secondary((click)='homeBase.openGitHub()')
-            i.fa.fa-github
+            i.fab.fa-github
             span GitHub
         button.btn.btn-secondary((click)='homeBase.reportBug()')
-            i.fa.fa-bug
+            i.fas.fa-bug
             span Report a problem
 
     .form-control-static.selectable.no-drag Version: {{homeBase.appVersion}}

terminus-core/src/components/tabBody.component.ts

@@ -17,7 +17,7 @@ import { BaseTabComponent } from '../components/baseTab.component'
 export class TabBodyComponent implements OnChanges {
     @Input() @HostBinding('class.active') active: boolean
     @Input() tab: BaseTabComponent
-    @ViewChild('placeholder', {read: ViewContainerRef}) placeholder: ViewContainerRef
+    @ViewChild('placeholder', { read: ViewContainerRef }) placeholder: ViewContainerRef
 
     ngOnChanges (changes) {
         if (changes.tab) {

terminus-core/src/components/tabHeader.component.ts

@@ -1,22 +1,14 @@
-import { Component, Input, HostBinding, HostListener, NgZone, ViewChild, ElementRef } from '@angular/core'
+import { Component, Input, Optional, Inject, HostBinding, HostListener, ViewChild, ElementRef } from '@angular/core'
 import { SortableComponent } from 'ng2-dnd'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { TabContextMenuItemProvider } from '../api/tabContextMenuProvider'
 import { BaseTabComponent } from './baseTab.component'
 import { RenameTabModalComponent } from './renameTabModal.component'
+import { HotkeysService } from '../services/hotkeys.service'
 import { ElectronService } from '../services/electron.service'
 import { AppService } from '../services/app.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
 
-const COLORS = [
-    { name: 'No color', value: null },
-    { name: 'Blue', value: '#0275d8' },
-    { name: 'Green', value: '#5cb85c' },
-    { name: 'Orange', value: '#f0ad4e' },
-    { name: 'Purple', value: '#613d7c' },
-    { name: 'Red', value: '#d9534f' },
-    { name: 'Yellow', value: '#ffd500' },
-]
-
 @Component({
     selector: 'tab-header',
     template: require('./tabHeader.component.pug'),
@@ -30,16 +22,24 @@ export class TabHeaderComponent {
     @Input() progress: number
     @ViewChild('handle') handle: ElementRef
 
-    private completionNotificationEnabled = false
-
     constructor (
         public app: AppService,
         private electron: ElectronService,
-        private zone: NgZone,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
+        private hotkeys: HotkeysService,
         private parentDraggable: SortableComponent,
-    ) { }
+        @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
+    ) {
+        this.hotkeys.matchedHotkey.subscribe((hotkey) => {
+            if (this.app.activeTab === this.tab) {
+                if (hotkey === 'rename-tab') {
+                    this.showRenameTabModal()
+                }
+            }
+        })
+        this.contextMenuProviders.sort((a, b) => a.weight - b.weight)
+    }
 
     ngOnInit () {
         if (this.hostApp.platform === Platform.macOS) {
@@ -50,7 +50,7 @@ export class TabHeaderComponent {
         })
     }
 
-    @HostListener('dblclick') onDoubleClick (): void {
+    showRenameTabModal (): void {
         let modal = this.ngbModal.open(RenameTabModalComponent)
         modal.componentInstance.value = this.tab.customTitle || this.tab.title
         modal.result.then(result => {
@@ -59,6 +59,19 @@ export class TabHeaderComponent {
         }).catch(() => null)
     }
 
+    async buildContextMenu (): Promise<Electron.MenuItemConstructorOptions[]> {
+        let items: Electron.MenuItemConstructorOptions[] = []
+        for (let section of await Promise.all(this.contextMenuProviders.map(x => x.getItems(this.tab, this)))) {
+            items.push({ type: 'separator' })
+            items = items.concat(section)
+        }
+        return items.slice(1)
+    }
+
+    @HostListener('dblclick') onDoubleClick (): void {
+        this.showRenameTabModal()
+    }
+
     @HostListener('auxclick', ['$event']) async onAuxClick ($event: MouseEvent) {
         if ($event.which === 2) {
             this.app.closeTab(this.tab, true)
@@ -66,85 +79,7 @@ export class TabHeaderComponent {
         if ($event.which === 3) {
             event.preventDefault()
 
-            let contextMenu = this.electron.remote.Menu.buildFromTemplate([
+            const contextMenu = this.electron.remote.Menu.buildFromTemplate(await this.buildContextMenu())
-                {
-                    label: 'Close',
-                    click: () => this.zone.run(() => {
-                        this.app.closeTab(this.tab, true)
-                    })
-                },
-                {
-                    label: 'Close other tabs',
-                    click: () => this.zone.run(() => {
-                        for (let tab of this.app.tabs.filter(x => x !== this.tab)) {
-                            this.app.closeTab(tab, true)
-                        }
-                    })
-                },
-                {
-                    label: 'Close tabs to the right',
-                    click: () => this.zone.run(() => {
-                        for (let tab of this.app.tabs.slice(this.app.tabs.indexOf(this.tab) + 1)) {
-                            this.app.closeTab(tab, true)
-                        }
-                    })
-                },
-                {
-                    label: 'Close tabs to the left',
-                    click: () => this.zone.run(() => {
-                        for (let tab of this.app.tabs.slice(0, this.app.tabs.indexOf(this.tab))) {
-                            this.app.closeTab(tab, true)
-                        }
-                    })
-                },
-                {
-                    label: 'Color',
-                    sublabel: COLORS.find(x => x.value === this.tab.color).name,
-                    submenu: COLORS.map(color => ({
-                        label: color.name,
-                        type: 'radio',
-                        checked: this.tab.color === color.value,
-                        click: () => this.zone.run(() => {
-                            this.tab.color = color.value
-                        }),
-                    })),
-                }
-            ])
-
-            let process = await this.tab.getCurrentProcess()
-            if (process) {
-                contextMenu.append(new this.electron.MenuItem({
-                    id: 'sep',
-                    type: 'separator',
-                }))
-                contextMenu.append(new this.electron.MenuItem({
-                    id: 'process-name',
-                    enabled: false,
-                    label: 'Current process: ' + process.name,
-                }))
-                contextMenu.append(new this.electron.MenuItem({
-                    id: 'completion',
-                    label: 'Notify when done',
-                    type: 'checkbox',
-                    checked: this.completionNotificationEnabled,
-                    click: () => this.zone.run(() => {
-                        this.completionNotificationEnabled = !this.completionNotificationEnabled
-
-                        if (this.completionNotificationEnabled) {
-                            this.app.observeTabCompletion(this.tab).subscribe(() => {
-                                new Notification('Process completed', {
-                                    body: process.name,
-                                }).addEventListener('click', () => {
-                                    this.app.selectTab(this.tab)
-                                })
-                                this.completionNotificationEnabled = false
-                            })
-                        } else {
-                            this.app.stopObservingTabCompletion(this.tab)
-                        }
-                    })
-                }))
-            }
 
             contextMenu.popup({
                 x: $event.pageX,

terminus-core/src/configDefaults.linux.yaml

@@ -7,46 +7,33 @@ hotkeys:
     - 'F11'
   close-tab:
     - 'Ctrl-Shift-W'
-    - ['Ctrl-A', 'K']
+  toggle-last-tab: []
-  toggle-last-tab:
+  rename-tab:
-    - ['Ctrl-A', 'A']
+    - 'Ctrl-Shift-R'
-    - ['Ctrl-A', 'Ctrl-A']
   next-tab:
     - 'Ctrl-Shift-ArrowRight'
-    - ['Ctrl-A', 'N']
     - 'Ctrl-Tab'
   previous-tab:
     - 'Ctrl-Shift-ArrowLeft'
-    - ['Ctrl-A', 'P']
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
-    - ['Ctrl-A', '1']
   tab-2:
     - 'Alt-2'
-    - ['Ctrl-A', '2']
   tab-3:
     - 'Alt-3'
-    - ['Ctrl-A', '3']
   tab-4:
     - 'Alt-4'
-    - ['Ctrl-A', '4']
   tab-5:
     - 'Alt-5'
-    - ['Ctrl-A', '5']
   tab-6:
     - 'Alt-6'
-    - ['Ctrl-A', '6']
   tab-7:
     - 'Alt-7'
-    - ['Ctrl-A', '7']
   tab-8:
     - 'Alt-8'
-    - ['Ctrl-A', '8']
   tab-9:
     - 'Alt-9'
-    - ['Ctrl-A', '9']
   tab-10:
     - 'Alt-0'
-    - ['Ctrl-A', '0']
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -8,6 +8,8 @@ hotkeys:
   close-tab:
     - '⌘-W'
   toggle-last-tab: []
+  rename-tab:
+    - '⌘-R'
   next-tab:
     - 'Ctrl-Tab'
   previous-tab:

terminus-core/src/configDefaults.windows.yaml

@@ -7,46 +7,33 @@ hotkeys:
     - 'F11'
   close-tab:
     - 'Ctrl-Shift-W'
-    - ['Ctrl-A', 'K']
+  toggle-last-tab: []
-  toggle-last-tab:
+  rename-tab:
-    - ['Ctrl-A', 'A']
+    - 'Ctrl-Shift-R'
-    - ['Ctrl-A', 'Ctrl-A']
   next-tab:
     - 'Ctrl-Shift-ArrowRight'
-    - ['Ctrl-A', 'N']
     - 'Ctrl-Tab'
   previous-tab:
     - 'Ctrl-Shift-ArrowLeft'
-    - ['Ctrl-A', 'P']
     - 'Ctrl-Shift-Tab'
   tab-1:
     - 'Alt-1'
-    - ['Ctrl-A', '1']
   tab-2:
     - 'Alt-2'
-    - ['Ctrl-A', '2']
   tab-3:
     - 'Alt-3'
-    - ['Ctrl-A', '3']
   tab-4:
     - 'Alt-4'
-    - ['Ctrl-A', '4']
   tab-5:
     - 'Alt-5'
-    - ['Ctrl-A', '5']
   tab-6:
     - 'Alt-6'
-    - ['Ctrl-A', '6']
   tab-7:
     - 'Alt-7'
-    - ['Ctrl-A', '7']
   tab-8:
     - 'Alt-8'
-    - ['Ctrl-A', '8']
   tab-9:
     - 'Alt-9'
-    - ['Ctrl-A', '9']
   tab-10:
     - 'Alt-0'
-    - ['Ctrl-A', '0']
 pluginBlacklist: []

terminus-core/src/index.ts

@@ -6,19 +6,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { PerfectScrollbarModule, PERFECT_SCROLLBAR_CONFIG } from 'ngx-perfect-scrollbar'
 import { DndModule } from 'ng2-dnd'
 
-import { AppService } from './services/app.service'
+import { AppHotkeyProvider } from './services/hotkeys.service'
-import { ConfigService } from './services/config.service'
-import { ElectronService } from './services/electron.service'
-import { HostAppService } from './services/hostApp.service'
-import { LogService } from './services/log.service'
-import { HomeBaseService } from './services/homeBase.service'
-import { HotkeysService, AppHotkeyProvider } from './services/hotkeys.service'
-import { DockingService } from './services/docking.service'
-import { ShellIntegrationService } from './services/shellIntegration.service'
-import { TabRecoveryService } from './services/tabRecovery.service'
-import { ThemesService } from './services/themes.service'
-import { TouchbarService } from './services/touchbar.service'
-import { UpdaterService } from './services/updater.service'
 
 import { AppRootComponent } from './components/appRoot.component'
 import { CheckboxComponent } from './components/checkbox.component'
@@ -36,33 +24,25 @@ import { AutofocusDirective } from './directives/autofocus.directive'
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
 import { Theme } from './api/theme'
+import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
 
 import { StandardTheme, StandardCompactTheme, PaperTheme } from './theme'
 import { CoreConfigProvider } from './config'
+import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu } from './tabContextMenu'
 
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
 import 'ng2-dnd/bundles/style.css'
 
 const PROVIDERS = [
-    AppService,
-    ConfigService,
-    DockingService,
-    ElectronService,
-    HomeBaseService,
-    HostAppService,
-    HotkeysService,
-    LogService,
-    ShellIntegrationService,
-    TabRecoveryService,
-    ThemesService,
-    TouchbarService,
-    UpdaterService,
     { provide: HotkeyProvider, useClass: AppHotkeyProvider, multi: true },
     { provide: Theme, useClass: StandardTheme, multi: true },
     { provide: Theme, useClass: StandardCompactTheme, multi: true },
     { provide: Theme, useClass: PaperTheme, multi: true },
     { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
-    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true }}
+    { provide: TabContextMenuItemProvider, useClass: CommonOptionsContextMenu, multi: true },
+    { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
+    { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
+    { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } }
 ]
 
 @NgModule({

terminus-core/src/services/app.service.ts

@@ -5,6 +5,7 @@ import { BaseTabComponent } from '../components/baseTab.component'
 import { Logger, LogService } from './log.service'
 import { ConfigService } from './config.service'
 import { HostAppService } from './hostApp.service'
+import { TabRecoveryService } from './tabRecovery.service'
 
 export declare type TabComponentType = new (...args: any[]) => BaseTabComponent
 
@@ -35,7 +36,7 @@ class CompletionObserver {
     }
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class AppService {
     tabs: BaseTabComponent[] = []
     activeTab: BaseTabComponent
@@ -61,11 +62,25 @@ export class AppService {
         private config: ConfigService,
         private hostApp: HostAppService,
         private injector: Injector,
+        private tabRecovery: TabRecoveryService,
         log: LogService,
     ) {
         this.logger = log.create('app')
 
         this.hostApp.windowCloseRequest$.subscribe(() => this.closeWindow())
+
+        this.tabRecovery.recoverTabs().then(tabs => {
+            for (let tab of tabs) {
+                this.openNewTab(tab.type, tab.options)
+            }
+
+            this.tabsChanged$.subscribe(() => {
+                tabRecovery.saveTabs(this.tabs)
+            })
+            setInterval(() => {
+                tabRecovery.saveTabs(this.tabs)
+            }, 30000)
+        })
     }
 
     openNewTab (type: TabComponentType, inputs?: any): BaseTabComponent {
@@ -105,7 +120,9 @@ export class AppService {
         this.activeTab = tab
         this.activeTabChange.next(tab)
         if (this.activeTab) {
-            this.activeTab.emitFocused()
+            setImmediate(() => {
+                this.activeTab.emitFocused()
+            })
             this.hostApp.setTitle(this.activeTab.title)
         }
     }
@@ -160,6 +177,17 @@ export class AppService {
         this.tabClosed.next(tab)
     }
 
+    async duplicateTab (tab: BaseTabComponent) {
+        let token = await tab.getRecoveryToken()
+        if (!token) {
+            return
+        }
+        let recoveredTab = await this.tabRecovery.recoverTab(token)
+        if (recoveredTab) {
+            this.openNewTab(recoveredTab.type, recoveredTab.options)
+        }
+    }
+
     async closeWindow () {
         for (let tab of this.tabs) {
             if (!await tab.canClose()) {

terminus-core/src/services/config.service.ts

@@ -56,7 +56,7 @@ export class ConfigProxy {
                 return real[key]
             } else {
                 if (isNonStructuralObjectMember(defaults[key])) {
-                    real[key] = {...defaults[key]}
+                    real[key] = { ...defaults[key] }
                     delete real[key].__nonStructural
                     return real[key]
                 } else {
@@ -74,7 +74,7 @@ export class ConfigProxy {
     setValue (key: string, value: any) { } // tslint:disable-line
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class ConfigService {
     store: any
     restartRequested: boolean

terminus-core/src/services/docking.service.ts

@@ -8,7 +8,7 @@ export interface IScreen {
     name: string
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class DockingService {
     constructor (
         private electron: ElectronService,

terminus-core/src/services/electron.service.ts

@@ -1,7 +1,12 @@
 import { Injectable } from '@angular/core'
 import { TouchBar, BrowserWindow, Menu, MenuItem } from 'electron'
 
-@Injectable()
+export interface MessageBoxResponse {
+    response: number
+    checkboxChecked?: boolean
+}
+
+@Injectable({ providedIn: 'root' })
 export class ElectronService {
     app: any
     ipcRenderer: any
@@ -54,4 +59,15 @@ export class ElectronService {
             this.remote.Menu.sendActionToFirstResponder('hide:')
         }
     }
+
+    showMessageBox (
+        browserWindow: Electron.BrowserWindow,
+        options: Electron.MessageBoxOptions
+    ): Promise<MessageBoxResponse> {
+        return new Promise(resolve => {
+            this.dialog.showMessageBox(browserWindow, options, (response, checkboxChecked) => {
+                resolve({ response, checkboxChecked })
+            })
+        })
+    }
 }

terminus-core/src/services/homeBase.service.ts

@@ -5,7 +5,7 @@ import { ConfigService } from './config.service'
 import ua = require('universal-analytics')
 import uuidv4 = require('uuid/v4')
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class HomeBaseService {
     appVersion: string
 

terminus-core/src/services/hostApp.service.ts

@@ -16,7 +16,7 @@ export interface Bounds {
     height: number
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class HostAppService {
     platform: Platform
     nodePlatform: string
@@ -27,8 +27,11 @@ export class HostAppService {
     private cliOpenDirectory = new Subject<string>()
     private cliRunCommand = new Subject<string[]>()
     private cliPaste = new Subject<string>()
+    private cliOpenProfile = new Subject<string>()
     private configChangeBroadcast = new Subject<void>()
     private windowCloseRequest = new Subject<void>()
+    private windowMoved = new Subject<void>()
+    private displayMetricsChanged = new Subject<void>()
     private logger: Logger
     private windowId: number
 
@@ -37,8 +40,11 @@ export class HostAppService {
     get cliOpenDirectory$ (): Observable<string> { return this.cliOpenDirectory }
     get cliRunCommand$ (): Observable<string[]> { return this.cliRunCommand }
     get cliPaste$ (): Observable<string> { return this.cliPaste }
+    get cliOpenProfile$ (): Observable<string> { return this.cliOpenProfile }
     get configChangeBroadcast$ (): Observable<void> { return this.configChangeBroadcast }
     get windowCloseRequest$ (): Observable<void> { return this.windowCloseRequest }
+    get windowMoved$ (): Observable<void> { return this.windowMoved }
+    get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
 
     constructor (
         private zone: NgZone,
@@ -78,6 +84,14 @@ export class HostAppService {
             this.zone.run(() => this.windowCloseRequest.next())
         })
 
+        electron.ipcRenderer.on('host:window-moved', () => {
+            this.zone.run(() => this.windowMoved.next())
+        })
+
+        electron.ipcRenderer.on('host:display-metrics-changed', () => {
+            this.zone.run(() => this.displayMetricsChanged.next())
+        })
+
         electron.ipcRenderer.on('host:second-instance', (_$event, argv: any, cwd: string) => this.zone.run(() => {
             this.logger.info('Second instance', argv)
             const op = argv._[0]
@@ -91,6 +105,8 @@ export class HostAppService {
                     text = shellEscape([text])
                 }
                 this.cliPaste.next(text)
+            } else if (op === 'profile') {
+                this.cliOpenProfile.next(argv.profileName)
             } else {
                 this.secondInstance.next()
             }

terminus-core/src/services/hotkeys.service.ts

@@ -17,7 +17,7 @@ interface EventBufferEntry {
     time: number,
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class HotkeysService {
     key = new EventEmitter<NativeKeyEvent>()
     matchedHotkey = new EventEmitter<string>()
@@ -80,8 +80,8 @@ export class HotkeysService {
     }
 
     getCurrentKeystrokes (): string[] {
-        this.currentKeystrokes = this.currentKeystrokes.filter((x) => performance.now() - x.time < KEY_TIMEOUT )
+        this.currentKeystrokes = this.currentKeystrokes.filter(x => performance.now() - x.time < KEY_TIMEOUT)
-        return stringifyKeySequence(this.currentKeystrokes.map((x) => x.event))
+        return stringifyKeySequence(this.currentKeystrokes.map(x => x.event))
     }
 
     registerGlobalHotkey () {
@@ -215,6 +215,10 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'toggle-fullscreen',
             name: 'Toggle fullscreen mode',
         },
+        {
+            id: 'rename-tab',
+            name: 'Rename Tab',
+        },
         {
             id: 'close-tab',
             name: 'Close tab',

terminus-core/src/services/log.service.ts

@@ -23,7 +23,7 @@ const initializeWinston = (electron: ElectronService) => {
                 colorize: false
             }),
             new winston.transports.Console({
-                level: 'info',
+                level: 'debug',
                 handleExceptions: false,
                 json: false,
                 colorize: true
@@ -53,7 +53,7 @@ export class Logger {
     log (...args: any[]) { this.doLog('log', ...args) }
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class LogService {
     private log: any
 

terminus-core/src/services/shellIntegration.service.ts

@@ -1,12 +1,12 @@
 import * as path from 'path'
 import * as fs from 'mz/fs'
-import { Registry } from 'rage-edit-tmp'
+import { Registry } from 'rage-edit'
 import { exec } from 'mz/child_process'
 import { Injectable } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { HostAppService, Platform } from './hostApp.service'
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class ShellIntegrationService {
     private automatorWorkflows = ['Open Terminus here.workflow', 'Paste path into Terminus.workflow']
     private automatorWorkflowsLocation: string
@@ -48,9 +48,9 @@ export class ShellIntegrationService {
 
     async isInstalled (): Promise<boolean> {
         if (this.hostApp.platform === Platform.macOS) {
-            return await fs.exists(path.join(this.automatorWorkflowsDestination, this.automatorWorkflows[0]))
+            return fs.exists(path.join(this.automatorWorkflowsDestination, this.automatorWorkflows[0]))
         } else if (this.hostApp.platform === Platform.Windows) {
-            return await Registry.has(this.registryKeys[0].path)
+            return Registry.has(this.registryKeys[0].path)
         }
         return true
     }

terminus-core/src/services/tabRecovery.service.ts

@@ -2,52 +2,56 @@ import { Injectable, Inject } from '@angular/core'
 import { TabRecoveryProvider, RecoveredTab } from '../api/tabRecovery'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { Logger, LogService } from '../services/log.service'
-import { AppService } from '../services/app.service'
 import { ConfigService } from '../services/config.service'
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class TabRecoveryService {
     logger: Logger
 
     constructor (
         @Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[],
-        private app: AppService,
         private config: ConfigService,
         log: LogService
     ) {
         this.logger = log.create('tabRecovery')
-        app.tabsChanged$.subscribe(() => {
-            this.saveTabs(app.tabs)
-        })
     }
 
-    saveTabs (tabs: BaseTabComponent[]) {
+    async saveTabs (tabs: BaseTabComponent[]) {
         window.localStorage.tabsRecovery = JSON.stringify(
-            tabs
+            await Promise.all(
-                .map((tab) => tab.getRecoveryToken())
+                tabs
-                .filter((token) => !!token)
+                    .map(tab => tab.getRecoveryToken())
+                    .filter(token => !!token)
+            )
         )
     }
 
-    async recoverTabs (): Promise<void> {
+    async recoverTab (token: any): Promise<RecoveredTab> {
+        for (let provider of this.config.enabledServices(this.tabRecoveryProviders)) {
+            try {
+                let tab = await provider.recover(token)
+                if (tab) {
+                    return tab
+                }
+            } catch (error) {
+                this.logger.warn('Tab recovery crashed:', token, provider, error)
+            }
+        }
+        return null
+    }
+
+    async recoverTabs (): Promise<RecoveredTab[]> {
         if (window.localStorage.tabsRecovery) {
             let tabs: RecoveredTab[] = []
             for (let token of JSON.parse(window.localStorage.tabsRecovery)) {
-                for (let provider of this.config.enabledServices(this.tabRecoveryProviders)) {
+                let tab = await this.recoverTab(token)
-                    try {
+                if (tab) {
-                        let tab = await provider.recover(token)
+                    tabs.push(tab)
-                        if (tab) {
-                            tabs.push(tab)
-                        }
-                    } catch (error) {
-                        this.logger.warn('Tab recovery crashed:', token, provider, error)
-                    }
                 }
             }
-            tabs.forEach(tab => {
+            return tabs
-                this.app.openNewTab(tab.type, tab.options)
-            })
         }
+        return []
     }
 
 }

terminus-core/src/services/themes.service.ts

@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core'
 import { ConfigService } from '../services/config.service'
 import { Theme } from '../api/theme'
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class ThemesService {
     private styleElement: HTMLElement = null
 

terminus-core/src/services/touchbar.service.ts

@@ -6,7 +6,7 @@ import { ElectronService } from './electron.service'
 import { HostAppService } from './hostApp.service'
 import { IToolbarButton, ToolbarButtonProvider } from '../api'
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class TouchbarService {
     private tabsSegmentedControl: TouchBarSegmentedControl
     private tabSegments: SegmentedControlSegment[] = []
@@ -49,8 +49,8 @@ export class TouchbarService {
         let touchBar = new this.electron.TouchBar({
             items: [
                 this.tabsSegmentedControl,
-                new this.electron.TouchBar.TouchBarSpacer({size: 'flexible'}),
+                new this.electron.TouchBar.TouchBarSpacer({ size: 'flexible' }),
-                new this.electron.TouchBar.TouchBarSpacer({size: 'small'}),
+                new this.electron.TouchBar.TouchBarSpacer({ size: 'small' }),
                 ...buttons.map(button => this.getButton(button))
             ]
         })

terminus-core/src/services/updater.service.ts

@@ -6,7 +6,7 @@ import { ElectronService } from './electron.service'
 
 const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/latest'
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class UpdaterService {
     private logger: Logger
     private downloaded: Promise<boolean>

terminus-core/src/tabContextMenu.ts

@@ -0,0 +1,144 @@
+import { Injectable, NgZone } from '@angular/core'
+import { AppService } from './services/app.service'
+import { BaseTabComponent } from './components/baseTab.component'
+import { TabHeaderComponent } from './components/tabHeader.component'
+import { TabContextMenuItemProvider } from './api/tabContextMenuProvider'
+
+@Injectable()
+export class CloseContextMenu extends TabContextMenuItemProvider {
+    weight = -5
+
+    constructor (
+        private app: AppService,
+        private zone: NgZone,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        return [
+            {
+                label: 'Close',
+                click: () => this.zone.run(() => {
+                    this.app.closeTab(tab, true)
+                })
+            },
+            {
+                label: 'Close other tabs',
+                click: () => this.zone.run(() => {
+                    for (let t of this.app.tabs.filter(x => x !== tab)) {
+                        this.app.closeTab(t, true)
+                    }
+                })
+            },
+            {
+                label: 'Close tabs to the right',
+                click: () => this.zone.run(() => {
+                    for (let t of this.app.tabs.slice(this.app.tabs.indexOf(tab) + 1)) {
+                        this.app.closeTab(t, true)
+                    }
+                })
+            },
+            {
+                label: 'Close tabs to the left',
+                click: () => this.zone.run(() => {
+                    for (let t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
+                        this.app.closeTab(t, true)
+                    }
+                })
+            },
+        ]
+    }
+}
+
+const COLORS = [
+    { name: 'No color', value: null },
+    { name: 'Blue', value: '#0275d8' },
+    { name: 'Green', value: '#5cb85c' },
+    { name: 'Orange', value: '#f0ad4e' },
+    { name: 'Purple', value: '#613d7c' },
+    { name: 'Red', value: '#d9534f' },
+    { name: 'Yellow', value: '#ffd500' },
+]
+
+@Injectable()
+export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
+    weight = -1
+
+    constructor (
+        private zone: NgZone,
+        private app: AppService,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        return [
+            {
+                label: 'Rename',
+                click: () => this.zone.run(() => tabHeader.showRenameTabModal())
+            },
+            {
+                label: 'Duplicate',
+                click: () => this.zone.run(() => this.app.duplicateTab(tab))
+            },
+            {
+                label: 'Color',
+                sublabel: COLORS.find(x => x.value === tab.color).name,
+                submenu: COLORS.map(color => ({
+                    label: color.name,
+                    type: 'radio',
+                    checked: tab.color === color.value,
+                    click: () => this.zone.run(() => {
+                        tab.color = color.value
+                    }),
+                })) as Electron.MenuItemConstructorOptions[],
+            }
+        ]
+    }
+}
+
+@Injectable()
+export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
+    constructor (
+        private app: AppService,
+        private zone: NgZone,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        let process = await tab.getCurrentProcess()
+        if (process) {
+            return [
+                {
+                    id: 'process-name',
+                    enabled: false,
+                    label: 'Current process: ' + process.name,
+                },
+                {
+                    label: 'Notify when done',
+                    type: 'checkbox',
+                    checked: (tab as any).__completionNotificationEnabled,
+                    click: () => this.zone.run(() => {
+                        ;(tab as any).__completionNotificationEnabled = !(tab as any).__completionNotificationEnabled
+
+                        if ((tab as any).__completionNotificationEnabled) {
+                            this.app.observeTabCompletion(tab).subscribe(() => {
+                                new Notification('Process completed', {
+                                    body: process.name,
+                                }).addEventListener('click', () => {
+                                    this.app.selectTab(tab)
+                                })
+                                ;(tab as any).__completionNotificationEnabled = false
+                            })
+                        } else {
+                            this.app.stopObservingTabCompletion(tab)
+                        }
+                    })
+                },
+            ]
+        }
+        return []
+    }
+}

terminus-core/src/theme.scss

@@ -51,6 +51,7 @@ $input-disabled-bg:              #333;
 $input-color:                    $body-color;
 $input-color-placeholder:        #333;
 $input-border-color:             #344;
+$input-border-width: 0;
 //$input-box-shadow:               inset 0 1px 1px rgba($black,.075);
 $input-border-radius:            0;
 $custom-select-border-radius: 0;
@@ -70,7 +71,7 @@ $popover-bg:                     $body-bg;
 
 $dropdown-bg:                    $body-bg;
 $dropdown-link-color:            $body-color;
-$dropdown-link-hover-color:      #333;
+$dropdown-link-hover-color:      white;
 $dropdown-link-hover-bg:         $body-bg2;
 //$dropdown-link-active-color:     $component-active-color;
 //$dropdown-link-active-bg:        $component-active-bg;
@@ -346,6 +347,15 @@ ngb-tabset .tab-content {
     }
 }
 
+.list-group.list-group-flush .list-group-item:not(.list-group-item-action) {
+    background: transparent;
+    border-color: rgba(0, 0, 0, 0.2);
+
+    &:not(:last-child) {
+        border-bottom: none;
+    }
+}
+
 select.form-control {
   -webkit-appearance: none;
   background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='24' height='24' viewBox='0 0 24 24'><path fill='#444' d='M7.406 7.828l4.594 4.594 4.594-4.594 1.406 1.406-6 6-6-6z'></path></svg>");
@@ -362,6 +372,15 @@ toggle.active .body .toggle {
     background: $blue;
 }
 
+.modal .modal-footer {
+    background: rgba(0, 0, 0, .25);
+
+    .btn {
+        font-weight: bold;
+        padding: 0.375rem 1.5rem;
+    }
+}
+
 .list-group-item svg {
     fill: white;
     fill-opacity: 0.75;

terminus-core/src/theme.ts

@@ -5,19 +5,19 @@ import { Theme } from './api'
 export class StandardTheme extends Theme {
     name = 'Standard'
     css = require('./theme.scss')
-    terminalBackground = '#1D272D'
+    terminalBackground = '#222a33'
 }
 
 @Injectable()
 export class StandardCompactTheme extends Theme {
     name = 'Compact'
     css = require('./theme.compact.scss')
-    terminalBackground = '#1D272D'
+    terminalBackground = '#222a33'
 }
 
 @Injectable()
 export class PaperTheme extends Theme {
     name = 'Paper'
     css = require('./theme.paper.scss')
-    terminalBackground = '#1D272D'
+    terminalBackground = '#f7f1e0'
 }

terminus-core/webpack.config.js

@@ -14,7 +14,7 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]',
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },

terminus-core/yarn.lock

@@ -486,10 +486,10 @@ qs@~6.5.1:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-rage-edit-tmp@^1.1.0:
+rage-edit@^1.2.0:
-  version "1.1.0"
+  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/rage-edit-tmp/-/rage-edit-tmp-1.1.0.tgz#fc5d76716d2fe2cf97dcafbf3e26753e3a08e3b2"
+  resolved "https://registry.yarnpkg.com/rage-edit/-/rage-edit-1.2.0.tgz#991860a60fef934d8a6d0f057e55786b02f94a2b"
-  integrity sha512-lR97QHY5WSf9orInMJhPqUbenkdiy7QbXUoRMI+wBZGyAPkxNwgo7h6ojq634QrBf/kQo3mVXYjuD3ZYraNaZQ==
+  integrity sha512-0RspBRc2s6We4g7hRCvT5mu7YPEnfjvQK8Tt354a2uUNJCMC7MKLvo/1mLvHUCQ/zbP6siQyp5VRZN7UCpMFZg==
 
 request@2.86.0:
   version "2.86.0"

terminus-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.68-c17-g8b64a81",
   "description": "Terminus' plugin manager",
   "keywords": [
     "terminus-builtin-plugin"

terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug

@@ -2,57 +2,61 @@
     strong Error in {{erroredPlugin}}:
     pre {{errorMessage}}
 
-button.btn.btn-outline-info.btn-sm.pull-right((click)='openPluginsFolder()')
+
-    i.fa.fa-folder
+.d-flex
-    span Plugins folder
+    h3.mb-1 Installed
+    button.btn.btn-outline-info.btn-sm.ml-auto((click)='openPluginsFolder()')
+        i.fas.fa-folder
+        span Plugins folder
     
-h3.mb-1 Installed
+.list-group.list-group-flush.mt-2
+    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"')
+        .mr-auto.d-flex.flex-column
+            div
+                strong {{plugin.name}}
+                small.text-muted.ml-1(*ngIf='!plugin.isBuiltin') {{plugin.version}} / {{plugin.author}}
+                small.text-warning.ml-1(*ngIf='config.store.pluginBlacklist.includes(plugin.name)') Disabled
+            a.text-muted.mb-0((click)='showPluginInfo(plugin)')
+                small {{plugin.description}}
 
-.mb-3.d-flex.w-100.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins|orderBy:"name"')
+        button.btn.btn-primary.ml-2(
-    button.btn.btn-outline-danger.active.mr-2(
+            *ngIf='npmInstalled && knownUpgrades[plugin.name]',
-        *ngIf='config.store.pluginBlacklist.includes(plugin.name)',
+            (click)='upgradePlugin(plugin)',
-        (click)='enablePlugin(plugin)'
+            [disabled]='busy[plugin.name] != undefined'
-    )
+        )
-        i.fa.fa-fw.fa-pause
+            i.fas.fa-fw.fa-arrow-up(*ngIf='busy[plugin.name] != BusyState.Installing')
-    button.btn.btn-outline-secondary.mr-2(
+            i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
-        *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
+            span Upgrade ({{knownUpgrades[plugin.name].version}})
-        (click)='disablePlugin(plugin)'
-    )
-        i.fa.fa-fw.fa-check
 
-    .mr-auto.d-flex.flex-column
+        button.btn.btn-primary.ml-2(
-        div
+            *ngIf='config.store.pluginBlacklist.includes(plugin.name)',
-            strong {{plugin.name}}
+            (click)='enablePlugin(plugin)'
-            small.text-muted.ml-1 {{plugin.version}} / {{plugin.author}}
+        )
-        a.text-muted.mb-0((click)='showPluginInfo(plugin)')
+            i.fas.fa-fw.fa-play
-            small {{plugin.description}}
+                
-
+        button.btn.btn-secondary.ml-2(
-    button.btn.btn-primary.ml-2(
+            *ngIf='!config.store.pluginBlacklist.includes(plugin.name)',
-        *ngIf='npmInstalled && knownUpgrades[plugin.name]',
+            (click)='disablePlugin(plugin)'
-        (click)='upgradePlugin(plugin)',
+        )
-        [disabled]='busy[plugin.name] != undefined'
+            i.fas.fa-fw.fa-pause
-    )
+            
-        i.fa.fa-fw.fa-arrow-up(*ngIf='busy[plugin.name] != BusyState.Installing')
+        button.btn.btn-danger.ml-2(
-        i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
+            (click)='uninstallPlugin(plugin)', 
-        span Upgrade ({{knownUpgrades[plugin.name].version}})
+            *ngIf='!plugin.isBuiltin && npmInstalled',
-        
+            [disabled]='busy[plugin.name] != undefined'
-    button.btn.btn-outline-danger.ml-2(
+        )
-        (click)='uninstallPlugin(plugin)', 
+            i.fas.fa-fw.fa-trash(*ngIf='busy[plugin.name] != BusyState.Uninstalling')
-        *ngIf='!plugin.isBuiltin && npmInstalled',
+            i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling')
-        [disabled]='busy[plugin.name] != undefined'
-    )
-        i.fa.fa-fw.fa-trash-o(*ngIf='busy[plugin.name] != BusyState.Uninstalling')
-        i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Uninstalling')
 
 .text-center.mt-5(*ngIf='npmMissing')
     h4 npm not installed
     p.mb-2 npm is required to install Terminus plugins.
     .btn-group
         button.btn.btn-outline-primary((click)='downloadNPM()')
-            i.fa.fa-download
+            i.fas.fa-download
             span Get npm
         button.btn.btn-outline-info((click)='checkNPM()')
-            i.fa.fa-refresh
+            i.fas.fa-refresh
             span Try again
 
 div(*ngIf='npmInstalled')
@@ -61,8 +65,8 @@ div(*ngIf='npmInstalled')
     .input-group.mb-3
         .input-group-prepend
             .input-group-text
-                i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='!availablePluginsReady')
+                i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='!availablePluginsReady')
-                i.fa.fa-fw.fa-search(*ngIf='availablePluginsReady')
+                i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady')
         input.form-control(
             type='text',
             [(ngModel)]='_1',
@@ -71,19 +75,19 @@ div(*ngIf='npmInstalled')
         )
 
 
-    .mb-4(*ngIf='availablePlugins$')
+    .list-group.list-group-flush.mb-4(*ngIf='availablePlugins$')
         ng-container(*ngFor='let plugin of (availablePlugins$|async|orderBy:"name")')
-            .d-flex.w-100.align-items-center.mb-3(*ngIf='!isAlreadyInstalled(plugin)')
+            .list-group-item.d-flex.align-items-center(*ngIf='!isAlreadyInstalled(plugin)')
-                button.btn.btn-primary.mr-2(
+                button.btn.btn-primary.mr-3(
                     (click)='installPlugin(plugin)',
                     [disabled]='busy[plugin.name] != undefined'
                 )
-                    i.fa.fa-fw.fa-download(*ngIf='busy[plugin.name] != BusyState.Installing')
+                    i.fas.fa-fw.fa-download(*ngIf='busy[plugin.name] != BusyState.Installing')
-                    i.fa.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
+                    i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy[plugin.name] == BusyState.Installing')
                 
                 div((click)='showPluginInfo(plugin)')
                     div
                         strong {{plugin.name}}
                         small.text-muted.ml-1 {{plugin.version}} / {{plugin.author}}
-                        i.fa.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official')
+                        i.fas.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official')
                     small.text-muted {{plugin.description}}

terminus-plugin-manager/src/components/pluginsSettingsTab.component.ts

@@ -117,7 +117,7 @@ export class PluginsSettingsTabComponent {
     }
 
     disablePlugin (plugin: IPluginInfo) {
-        this.config.store.pluginBlacklist.push(plugin.name)
+        this.config.store.pluginBlacklist = [...this.config.store.pluginBlacklist, plugin.name]
         this.config.save()
         this.config.requestRestart()
     }

terminus-plugin-manager/src/index.ts

@@ -22,7 +22,6 @@ import { PluginsSettingsTabProvider } from './settings'
     providers: [
         { provide: SettingsTabProvider, useClass: PluginsSettingsTabProvider, multi: true },
         { provide: ConfigProvider, useClass: PluginsConfigProvider, multi: true },
-        PluginManagerService,
     ],
     entryComponents: [
         PluginsSettingsTabComponent,

terminus-plugin-manager/src/services/pluginManager.service.ts

@@ -23,7 +23,7 @@ export interface IPluginInfo {
     path?: string
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class PluginManagerService {
     logger: Logger
     builtinPluginsPath: string = (window as any).builtinPluginsPath
@@ -48,7 +48,7 @@ export class PluginManagerService {
             return
         }
         if (this.hostApp.platform !== Platform.Windows) {
-            this.envPath = (await exec('$SHELL -c -i \'echo $PATH\''))[0].toString().trim()
+            this.envPath = (await exec('$SHELL -i -c \'echo $PATH\''))[0].toString().trim()
             let searchPaths = this.envPath.split(':')
             for (let searchPath of searchPaths) {
                 if (await fs.exists(path.join(searchPath, 'npm'))) {

terminus-plugin-manager/webpack.config.js

@@ -13,7 +13,7 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]',
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },

terminus-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.68-c17-g8b64a81",
   "description": "Terminus terminal settings page",
   "keywords": [
     "terminus-builtin-plugin"

terminus-settings/src/api.ts

@@ -1,5 +1,6 @@
 export abstract class SettingsTabProvider {
     id: string
+    icon: string
     title: string
 
     getComponentType (): any {

terminus-settings/src/components/settingsTab.component.pug

@@ -3,6 +3,7 @@ button.btn.btn-outline-warning.btn-block(*ngIf='config.restartRequested', '(clic
 ngb-tabset.vertical(type='pills', [activeId]='activeTab')
     ngb-tab(id='application')
         ng-template(ngbTabTitle)
+            i.fas.fa-fw.fa-window-maximize.mr-2
             | Application
         ng-template(ngbTabContent)
             .d-flex.align-items-center.mb-4
@@ -12,11 +13,11 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                 .text-muted.mr-auto {{homeBase.appVersion}}
                             
                 button.btn.btn-secondary.mr-3((click)='homeBase.openGitHub()')
-                    i.fa.fa-github
+                    i.fab.fa-github
                     span GitHub
                     
                 button.btn.btn-secondary((click)='homeBase.reportBug()')
-                    i.fa.fa-bug
+                    i.fas.fa-bug
                     span Report a problem
 
             .form-line(*ngIf='!isShellIntegrationInstalled')
@@ -24,7 +25,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                     .title Shell integration
                     .description Allows quickly opening a terminal in the selected folder
                 button.btn.btn-primary((click)='installShellIntegration()')
-                    i.fa.fa-check 
+                    i.fas.fa-check 
                     span Install
 
             .form-line
@@ -225,7 +226,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                     .title Debugging
 
                 button.btn.btn-secondary((click)='hostApp.openDevTools()')
-                    i.fa.fa-bug
+                    i.fas.fa-bug
                     span Open DevTools
 
             .form-line
@@ -247,6 +248,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
 
     ngb-tab(id='hotkeys')
         ng-template(ngbTabTitle)
+            i.fas.fa-fw.fa-keyboard.mr-2
             | Hotkeys
         ng-template(ngbTabContent)
             h3.mb-3 Hotkeys
@@ -254,7 +256,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
             .input-group.mb-4
                 .input-group-prepend
                     .input-group-text
-                        i.fa.fa-fw.fa-search
+                        i.fas.fa-fw.fa-search
                 input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter')
                             
             .form-group
@@ -274,6 +276,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
 
     ngb-tab(*ngFor='let provider of settingsProviders', [id]='provider.id')
         ng-template(ngbTabTitle)
+            i(class='fas fa-fw mr-2 fa-{{provider.icon || "puzzle-piece"}}')
             | {{provider.title}}
         ng-template(ngbTabContent)
             settings-tab-body([provider]='provider')
@@ -281,6 +284,7 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                 
     ngb-tab(id='config-file')
         ng-template(ngbTabTitle)
+            i.fas.fa-fw.fa-code.mr-2
             | Config file
         ng-template.test(ngbTabContent)
             .d-flex.flex-column.w-100.h-100
@@ -298,8 +302,8 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                         )   
                 .mt-3
                     button.btn.btn-primary((click)='saveConfigFile()', *ngIf='isConfigFileValid()')
-                        i.fa.fa-check.mr-2
+                        i.fas.fa-check.mr-2
                         | Save and apply
                     button.btn.btn-primary(disabled, *ngIf='!isConfigFileValid()')
-                        i.fa.fa-warning.mr-2
+                        i.fas.fa-exclamation-triangle.mr-2
                         | Invalid syntax

terminus-settings/src/components/settingsTab.component.ts

@@ -2,12 +2,12 @@ import * as yaml from 'js-yaml'
 import * as os from 'os'
 import { Subscription } from 'rxjs'
 import { Component, Inject, Input, HostBinding } from '@angular/core'
-import { HotkeysService } from 'terminus-core'
 import {
     ElectronService,
     DockingService,
     ConfigService,
     IHotkeyDescription,
+    HotkeysService,
     BaseTabComponent,
     Theme,
     HostAppService,
@@ -80,7 +80,7 @@ export class SettingsTabComponent extends BaseTabComponent {
         this.isShellIntegrationInstalled = await this.shellIntegration.isInstalled()
     }
 
-    getRecoveryToken (): any {
+    async getRecoveryToken (): Promise<any> {
         return { type: 'app:settings' }
     }
 

terminus-settings/src/components/settingsTabBody.component.ts

@@ -7,7 +7,7 @@ import { SettingsTabProvider } from '../api'
 })
 export class SettingsTabBodyComponent {
     @Input() provider: SettingsTabProvider
-    @ViewChild('placeholder', {read: ViewContainerRef}) placeholder: ViewContainerRef
+    @ViewChild('placeholder', { read: ViewContainerRef }) placeholder: ViewContainerRef
     component: ComponentRef<Component>
 
     constructor (private componentFactoryResolver: ComponentFactoryResolver) { }

terminus-settings/src/index.ts

@@ -4,8 +4,7 @@ import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgPipesModule } from 'ngx-pipes'
 
-import { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
+import TerminusCorePlugin, { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
-import TerminusCorePlugin from 'terminus-core'
 
 import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component'
 import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component'

terminus-settings/src/recoveryProvider.ts

@@ -6,7 +6,7 @@ import { SettingsTabComponent } from './components/settingsTab.component'
 @Injectable()
 export class RecoveryProvider extends TabRecoveryProvider {
     async recover (recoveryToken: any): Promise<RecoveredTab> {
-        if (recoveryToken.type === 'app:settings') {
+        if (recoveryToken && recoveryToken.type === 'app:settings') {
             return { type: SettingsTabComponent }
         }
         return null

terminus-settings/webpack.config.js

@@ -14,7 +14,7 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]',
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },

terminus-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-ssh",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.68-c17-g8b64a81",
   "description": "SSH connection manager for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -36,9 +36,11 @@
   },
   "optionalDependencies": {
     "wincredmgr": "^2.0.0",
+    "windows-process-tree": "^0.2.3",
     "xkeychain": "^0.0.6"
   },
   "dependencies": {
-    "ssh2": "^0.5.5"
+    "ssh2": "^0.8.2",
+    "ssh2-streams": "^0.4.2"
   }
 }

terminus-ssh/src/api.ts

@@ -7,6 +7,13 @@ export interface LoginScript {
     optional?: boolean
 }
 
+export enum SSHAlgorithmType {
+    HMAC = 'hmac',
+    KEX = 'kex',
+    CIPHER = 'cipher',
+    HOSTKEY = 'serverHostKey'
+}
+
 export interface SSHConnection {
     name?: string
     host: string
@@ -19,14 +26,17 @@ export interface SSHConnection {
     keepaliveInterval?: number
     keepaliveCountMax?: number
     readyTimeout?: number
+
+    algorithms?: {[t: string]: string[]}
 }
 
 export class SSHSession extends BaseSession {
     scripts?: LoginScript[]
+    shell: any
 
-    constructor (private shell: any, conn: SSHConnection) {
+    constructor (public connection: SSHConnection) {
         super()
-        this.scripts = conn.scripts || []
+        this.scripts = connection.scripts || []
     }
 
     start () {
@@ -87,15 +97,21 @@ export class SSHSession extends BaseSession {
     }
 
     resize (columns, rows) {
-        this.shell.setWindow(rows, columns)
+        if (this.shell) {
+            this.shell.setWindow(rows, columns)
+        }
     }
 
     write (data) {
-        this.shell.write(data)
+        if (this.shell) {
+            this.shell.write(data)
+        }
     }
 
     kill (signal?: string) {
-        this.shell.signal(signal || 'TERM')
+        if (this.shell) {
+            this.shell.signal(signal || 'TERM')
+        }
     }
 
     async getChildProcesses (): Promise<any[]> {

terminus-ssh/src/components/editConnectionModal.component.pug

@@ -56,7 +56,7 @@
                         )
                         .input-group-btn
                             button.btn.btn-secondary((click)='selectPrivateKey()')
-                                i.fa.fa-folder-open
+                                i.fas.fa-folder-open
 
         ngb-tab(id='advanced')
             ng-template(ngbTabTitle)
@@ -85,6 +85,27 @@
                         placeholder='20000', 
                         [(ngModel)]='connection.readyTimeout', 
                     )
+                    
+                .form-group
+                    label Ciphers
+                    div(*ngFor='let alg of supportedAlgorithms.cipher')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.cipher[alg]')
+
+                .form-group
+                    label Key exchange
+                    div(*ngFor='let alg of supportedAlgorithms.kex')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.kex[alg]')
+
+                .form-group
+                    label HMAC
+                    div(*ngFor='let alg of supportedAlgorithms.hmac')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.hmac[alg]')
+
+                .form-group
+                    label Host key
+                    div(*ngFor='let alg of supportedAlgorithms.serverHostKey')
+                        checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]')
+
 
         ngb-tab(id='scripts')
             ng-template(ngbTabTitle)
@@ -119,11 +140,11 @@
                         td
                             .input-group.flex-nowrap
                                 button.btn.btn-outline-info.ml-0((click)='moveScriptUp(script)')
-                                    i.fa.fa-arrow-up
+                                    i.fas.fa-arrow-up
                                 button.btn.btn-outline-info.ml-0((click)='moveScriptDown(script)')
-                                    i.fa.fa-arrow-down
+                                    i.fas.fa-arrow-down
                                 button.btn.btn-outline-danger.ml-0((click)='deleteScript(script)')
-                                    i.fa.fa-trash-o
+                                    i.fas.fa-trash
                     tr
                         td
                             input.form-control(
@@ -148,9 +169,9 @@
                         td
                             .input-group.flex-nowrap
                                 button.btn.btn-outline-info.ml-0((click)='addScript()')
-                                    i.fa.fa-check
+                                    i.fas.fa-check
                                 button.btn.btn-outline-danger.ml-0((click)='clearScript()')
-                                    i.fa.fa-trash-o
+                                    i.fas.fa-trash
                     
 .modal-footer
     button.btn.btn-outline-primary((click)='save()') Save

terminus-ssh/src/components/editConnectionModal.component.ts

@@ -2,7 +2,8 @@ import { Component } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { ElectronService, HostAppService } from 'terminus-core'
 import { PasswordStorageService } from '../services/passwordStorage.service'
-import { SSHConnection, LoginScript } from '../api'
+import { SSHConnection, LoginScript, SSHAlgorithmType } from '../api'
+import { ALGORITHMS } from 'ssh2-streams/lib/constants'
 
 @Component({
     template: require('./editConnectionModal.component.pug'),
@@ -12,6 +13,10 @@ export class EditConnectionModalComponent {
     newScript: LoginScript
     hasSavedPassword: boolean
 
+    supportedAlgorithms: {[id: string]: string[]} = {}
+    defaultAlgorithms: {[id: string]: string[]} = {}
+    algorithms: {[id: string]: {[a: string]: boolean}} = {}
+
     constructor (
         private modalInstance: NgbActiveModal,
         private electron: ElectronService,
@@ -19,10 +24,41 @@ export class EditConnectionModalComponent {
         private passwordStorage: PasswordStorageService,
     ) {
         this.newScript = { expect: '', send: '' }
+
+        for (let k of Object.values(SSHAlgorithmType)) {
+            this.supportedAlgorithms[k] = ALGORITHMS[
+                {
+                    [SSHAlgorithmType.KEX]: 'SUPPORTED_KEX',
+                    [SSHAlgorithmType.HOSTKEY]: 'SUPPORTED_SERVER_HOST_KEY',
+                    [SSHAlgorithmType.CIPHER]: 'SUPPORTED_CIPHER',
+                    [SSHAlgorithmType.HMAC]: 'SUPPORTED_HMAC',
+                }[k]
+            ]
+            this.defaultAlgorithms[k] = ALGORITHMS[
+                {
+                    [SSHAlgorithmType.KEX]: 'KEX',
+                    [SSHAlgorithmType.HOSTKEY]: 'SERVER_HOST_KEY',
+                    [SSHAlgorithmType.CIPHER]: 'CIPHER',
+                    [SSHAlgorithmType.HMAC]: 'HMAC',
+                }[k]
+            ]
+        }
+        console.log(this)
     }
 
     async ngOnInit () {
         this.hasSavedPassword = !!(await this.passwordStorage.loadPassword(this.connection))
+        this.connection.algorithms = this.connection.algorithms || {}
+        for (let k of Object.values(SSHAlgorithmType)) {
+            if (!this.connection.algorithms[k]) {
+                this.connection.algorithms[k] = this.defaultAlgorithms[k]
+            }
+
+            this.algorithms[k] = {}
+            for (let alg of this.connection.algorithms[k]) {
+                this.algorithms[k][alg] = true
+            }
+        }
     }
 
     clearSavedPassword () {
@@ -43,6 +79,11 @@ export class EditConnectionModalComponent {
     }
 
     save () {
+        for (let k of Object.values(SSHAlgorithmType)) {
+            this.connection.algorithms[k] = Object.entries(this.algorithms[k])
+                .filter(([k, v]) => !!v)
+                .map(([k, v]) => k)
+        }
         this.modalInstance.close(this.connection)
     }
 
@@ -66,8 +107,17 @@ export class EditConnectionModalComponent {
         }
     }
 
-    deleteScript (script: LoginScript) {
+    async deleteScript (script: LoginScript) {
-        if (confirm(`Delete?`)) {
+        if ((await this.electron.showMessageBox(
+            this.hostApp.getWindow(),
+            {
+                type: 'warning',
+                message: 'Delete this script?',
+                detail: script.expect,
+                buttons: ['Keep', 'Delete'],
+                defaultId: 1,
+            }
+        )).response === 1) {
             this.connection.scripts = this.connection.scripts.filter(x => x !== script)
         }
     }
@@ -76,7 +126,7 @@ export class EditConnectionModalComponent {
         if (!this.connection.scripts) {
             this.connection.scripts = []
         }
-        this.connection.scripts.push({...this.newScript})
+        this.connection.scripts.push({ ...this.newScript })
         this.clearScript()
     }
 

terminus-ssh/src/components/sshModal.component.pug

@@ -10,10 +10,10 @@
     
     .list-group.mt-3(*ngIf='lastConnection')
         a.list-group-item.list-group-item-action.d-flex.align-items-center((click)='connect(lastConnection)') 
-            i.fa.fa-fw.fa-history
+            i.fas.fa-fw.fa-history
             .mr-auto {{lastConnection.name}}
             button.btn.btn-outline-danger.btn-sm((click)='clearLastConnection(); $event.stopPropagation()')
-                i.fa.fa-trash-o
+                i.fas.fa-trash
     
     .list-group.mt-3.connections-list(*ngIf='childGroups.length')
         ng-container(*ngFor='let group of childGroups') 
@@ -27,4 +27,6 @@
                 .list-group-item.list-group-item-action.pl-5.d-flex.align-items-center(
                     *ngFor='let connection of group.connections', 
                     (click)='connect(connection)'
-                ) {{connection.name}}
+                ) 
+                    .mr-2 {{connection.name}}
+                    .text-muted {{connection.host}}

terminus-ssh/src/components/sshModal.component.ts

@@ -61,7 +61,7 @@ export class SSHModalComponent {
 
     connect (connection: SSHConnection) {
         this.close()
-        this.ssh.connect(connection).catch(error => {
+        this.ssh.openTab(connection).catch(error => {
             this.toastr.error(`Could not connect: ${error}`)
         }).then(() => {
             setTimeout(() => {

terminus-ssh/src/components/sshSettingsTab.component.pug

@@ -1,25 +1,28 @@
 h3 Connections
 
-.list-group.mt-3.mb-3
+.list-group.list-group-flush.mt-3.mb-3
     ng-container(*ngFor='let group of childGroups') 
-        .list-group-item.list-group-item-action.d-flex.align-items-center((click)='groupCollapsed[group.name] = !groupCollapsed[group.name]')
+        .list-group-item.list-group-item-action.d-flex.align-items-center(
+            (click)='groupCollapsed[group.name] = !groupCollapsed[group.name]'
+        )
             .fa.fa-fw.fa-chevron-right(*ngIf='groupCollapsed[group.name]')
             .fa.fa-fw.fa-chevron-down(*ngIf='!groupCollapsed[group.name]')
             span.ml-3.mr-auto {{group.name || "Ungrouped"}}
             button.btn.btn-outline-info.ml-2((click)='editGroup(group)')
-                i.fa.fa-pencil
+                i.fas.fa-edit
             button.btn.btn-outline-danger.ml-1((click)='deleteGroup(group)')
-                i.fa.fa-trash-o
+                i.fas.fa-trash
         ng-container(*ngIf='!groupCollapsed[group.name]')
-            .list-group-item.pl-5.d-flex.align-items-center(*ngFor='let connection of group.connections') 
+            .list-group-item.list-group-item-action.pl-5.d-flex.align-items-center(
+                *ngFor='let connection of group.connections',
+                (click)='editConnection(connection)'
+            )
                 .mr-auto
                     div {{connection.name}}
                     .text-muted {{connection.host}}
-                button.btn.btn-outline-info.ml-2((click)='editConnection(connection)')
+                button.btn.btn-outline-danger.ml-1((click)='$event.stopPropagation(); deleteConnection(connection)')
-                    i.fa.fa-pencil
+                    i.fas.fa-trash
-                button.btn.btn-outline-danger.ml-1((click)='deleteConnection(connection)')
-                    i.fa.fa-trash-o
                     
-button.btn.btn-outline-primary((click)='createConnection()')
+button.btn.btn-primary((click)='createConnection()')
-    div.fa.fa-fw.fa-globe
+    i.fas.fa-fw.fa-plus
     span.ml-2 Add connection

terminus-ssh/src/components/sshSettingsTab.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { ConfigService } from 'terminus-core'
+import { ConfigService, ElectronService, HostAppService } from 'terminus-core'
 import { SSHConnection, ISSHConnectionGroup } from '../api'
 import { EditConnectionModalComponent } from './editConnectionModal.component'
 import { PromptModalComponent } from './promptModal.component'
@@ -15,6 +15,8 @@ export class SSHSettingsTabComponent {
 
     constructor (
         public config: ConfigService,
+        private electron: ElectronService,
+        private hostApp: HostAppService,
         private ngbModal: NgbModal,
     ) {
         this.connections = this.config.store.ssh.connections
@@ -44,13 +46,22 @@ export class SSHSettingsTabComponent {
         modal.componentInstance.connection = Object.assign({}, connection)
         modal.result.then(result => {
             Object.assign(connection, result)
+            this.config.store.ssh.connections = this.connections
             this.config.save()
             this.refresh()
         })
     }
 
-    deleteConnection (connection: SSHConnection) {
+    async deleteConnection (connection: SSHConnection) {
-        if (confirm(`Delete "${connection.name}"?`)) {
+        if ((await this.electron.showMessageBox(
+            this.hostApp.getWindow(),
+            {
+                type: 'warning',
+                message: `Delete "${connection.name}"?`,
+                buttons: ['Keep', 'Delete'],
+                defaultId: 1,
+            }
+        )).response === 1) {
             this.connections = this.connections.filter(x => x !== connection)
             this.config.store.ssh.connections = this.connections
             this.config.save()
@@ -67,14 +78,23 @@ export class SSHSettingsTabComponent {
                 for (let connection of this.connections.filter(x => x.group === group.name)) {
                     connection.group = result
                 }
+                this.config.store.ssh.connections = this.connections
                 this.config.save()
                 this.refresh()
             }
         })
     }
 
-    deleteGroup (group: ISSHConnectionGroup) {
+    async deleteGroup (group: ISSHConnectionGroup) {
-        if (confirm(`Delete "${group}"?`)) {
+        if ((await this.electron.showMessageBox(
+            this.hostApp.getWindow(),
+            {
+                type: 'warning',
+                message: `Delete "${group}"?`,
+                buttons: ['Keep', 'Delete'],
+                defaultId: 1,
+            }
+        )).response === 1) {
             for (let connection of this.connections.filter(x => x.group === group.name)) {
                 connection.group = null
             }
@@ -84,6 +104,7 @@ export class SSHSettingsTabComponent {
     }
 
     refresh () {
+        this.connections = this.config.store.ssh.connections
         this.childGroups = []
 
         for (let connection of this.connections) {

terminus-ssh/src/components/sshTab.component.scss

@@ -0,0 +1,13 @@
+:host {
+    flex: auto;
+    display: flex;
+    overflow: hidden;
+
+    &> .content {
+        flex: auto;
+        position: relative;
+        display: block;
+        overflow: hidden;
+        margin: 15px;
+    }
+}

terminus-ssh/src/components/sshTab.component.ts

@@ -0,0 +1,67 @@
+import { Component } from '@angular/core'
+import { first } from 'rxjs/operators'
+import { BaseTerminalTabComponent } from 'terminus-terminal'
+import { SSHService } from '../services/ssh.service'
+import { SSHConnection, SSHSession } from '../api'
+
+@Component({
+    template: `
+        <div
+            #content
+            class="content"
+        ></div>
+    `,
+    styles: [require('./sshTab.component.scss')],
+})
+export class SSHTabComponent extends BaseTerminalTabComponent {
+    connection: SSHConnection
+    ssh: SSHService
+    session: SSHSession
+
+    ngOnInit () {
+        this.logger = this.log.create('terminalTab')
+        this.ssh = this.injector.get(SSHService)
+        this.frontendReady$.pipe(first()).subscribe(() => {
+            this.initializeSession()
+        })
+
+        super.ngOnInit()
+
+        setImmediate(() => {
+            this.setTitle(this.connection.name)
+        })
+    }
+
+    async initializeSession () {
+        if (!this.connection) {
+            this.logger.error('No SSH connection info supplied')
+            return
+        }
+
+        this.session = new SSHSession(this.connection)
+        this.attachSessionHandlers()
+        this.write(`Connecting to ${this.connection.host}`)
+        let interval = setInterval(() => this.write('.'), 500)
+        try {
+            await this.ssh.connectSession(this.session, message => {
+                this.write('\r\n' + message)
+            })
+        } catch (e) {
+            this.write('\r\n')
+            this.write(e.message)
+            return
+        } finally {
+            clearInterval(interval)
+            this.write('\r\n')
+        }
+        this.session.resize(this.size.columns, this.size.rows)
+        this.session.start()
+    }
+
+    async getRecoveryToken (): Promise<any> {
+        return {
+            type: 'app:ssh-tab',
+            connection: this.connection,
+        }
+    }
+}

terminus-ssh/src/index.ts

@@ -3,20 +3,19 @@ import { CommonModule } from '@angular/common'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ToastrModule } from 'ngx-toastr'
-import { ToolbarButtonProvider, ConfigProvider } from 'terminus-core'
+import TerminusCoreModule, { ToolbarButtonProvider, ConfigProvider, TabRecoveryProvider } from 'terminus-core'
-import TerminusCoreModule from 'terminus-core'
 import { SettingsTabProvider } from 'terminus-settings'
 
 import { EditConnectionModalComponent } from './components/editConnectionModal.component'
 import { SSHModalComponent } from './components/sshModal.component'
 import { PromptModalComponent } from './components/promptModal.component'
 import { SSHSettingsTabComponent } from './components/sshSettingsTab.component'
-import { SSHService } from './services/ssh.service'
+import { SSHTabComponent } from './components/sshTab.component'
-import { PasswordStorageService } from './services/passwordStorage.service'
 
 import { ButtonProvider } from './buttonProvider'
 import { SSHConfigProvider } from './config'
 import { SSHSettingsTabProvider } from './settings'
+import { RecoveryProvider } from './recoveryProvider'
 
 @NgModule({
     imports: [
@@ -27,23 +26,24 @@ import { SSHSettingsTabProvider } from './settings'
         TerminusCoreModule,
     ],
     providers: [
-        PasswordStorageService,
-        SSHService,
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
         { provide: ConfigProvider, useClass: SSHConfigProvider, multi: true },
         { provide: SettingsTabProvider, useClass: SSHSettingsTabProvider, multi: true },
+        { provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true },
     ],
     entryComponents: [
         EditConnectionModalComponent,
         PromptModalComponent,
         SSHModalComponent,
         SSHSettingsTabComponent,
+        SSHTabComponent,
     ],
     declarations: [
         EditConnectionModalComponent,
         PromptModalComponent,
         SSHModalComponent,
         SSHSettingsTabComponent,
+        SSHTabComponent,
     ],
 })
 export default class SSHModule { }

terminus-ssh/src/recoveryProvider.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core'
+import { TabRecoveryProvider, RecoveredTab } from 'terminus-core'
+
+import { SSHTabComponent } from './components/sshTab.component'
+
+@Injectable()
+export class RecoveryProvider extends TabRecoveryProvider {
+    async recover (recoveryToken: any): Promise<RecoveredTab> {
+        if (recoveryToken && recoveryToken.type === 'app:ssh-tab') {
+            return {
+                type: SSHTabComponent,
+                options: { connection: recoveryToken.connection },
+            }
+        }
+        return null
+    }
+}

terminus-ssh/src/services/passwordStorage.service.ts

@@ -13,7 +13,7 @@ try {
     }
 }
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class PasswordStorageService {
     constructor (
         private zone: NgZone,

terminus-ssh/src/services/ssh.service.ts

@@ -5,13 +5,19 @@ import * as fs from 'mz/fs'
 import * as path from 'path'
 import { ToastrService } from 'ngx-toastr'
 import { AppService, HostAppService, Platform, Logger, LogService } from 'terminus-core'
-import { TerminalTabComponent } from 'terminus-terminal'
 import { SSHConnection, SSHSession } from '../api'
 import { PromptModalComponent } from '../components/promptModal.component'
+import { SSHTabComponent } from '../components/sshTab.component'
 import { PasswordStorageService } from './passwordStorage.service'
 const { SSH2Stream } = require('ssh2-streams')
 
-@Injectable()
+let windowsProcessTree
+try {
+    windowsProcessTree = require('windows-process-tree/build/Release/windows_process_tree.node')
+} catch (e) {
+} // tslint:disable-line
+
+@Injectable({ providedIn: 'root' })
 export class SSHService {
     private logger: Logger
 
@@ -27,14 +33,31 @@ export class SSHService {
         this.logger = log.create('ssh')
     }
 
-    async connect (connection: SSHConnection): Promise<TerminalTabComponent> {
+    async openTab (connection: SSHConnection): Promise<SSHTabComponent> {
+        return this.zone.run(() => this.app.openNewTab(
+            SSHTabComponent,
+            { connection }
+        ) as SSHTabComponent)
+    }
+
+    async connectSession (session: SSHSession, logCallback?: (s: string) => void): Promise<void> {
         let privateKey: string = null
         let privateKeyPassphrase: string = null
-        let privateKeyPath = connection.privateKey
+        let privateKeyPath = session.connection.privateKey
+
+        if (!logCallback) {
+            logCallback = (s) => null
+        }
+
+        const log = s => {
+            logCallback(s)
+            this.logger.info(s)
+        }
+
         if (!privateKeyPath) {
             let userKeyPath = path.join(process.env.HOME, '.ssh', 'id_rsa')
             if (await fs.exists(userKeyPath)) {
-                this.logger.info('Using user\'s default private key:', userKeyPath)
+                log(`Using user's default private key: ${userKeyPath}`)
                 privateKeyPath = userKeyPath
             }
         }
@@ -43,11 +66,12 @@ export class SSHService {
             try {
                 privateKey = (await fs.readFile(privateKeyPath)).toString()
             } catch (error) {
+                log('Could not read the private key file')
                 this.toastr.warning('Could not read the private key file')
             }
 
             if (privateKey) {
-                this.logger.info('Loaded private key from', privateKeyPath)
+                log(`Loading private key from ${privateKeyPath}`)
 
                 let encrypted = privateKey.includes('ENCRYPTED')
                 if (privateKeyPath.toLowerCase().endsWith('.ppk')) {
@@ -55,6 +79,7 @@ export class SSHService {
                 }
                 if (encrypted) {
                     let modal = this.ngbModal.open(PromptModalComponent)
+                    log('Key requires passphrase')
                     modal.componentInstance.prompt = 'Private key passphrase'
                     modal.componentInstance.password = true
                     try {
@@ -67,16 +92,16 @@ export class SSHService {
         let ssh = new Client()
         let connected = false
         let savedPassword: string = null
-        await new Promise((resolve, reject) => {
+        await new Promise(async (resolve, reject) => {
             ssh.on('ready', () => {
                 connected = true
                 if (savedPassword) {
-                    this.passwordStorage.savePassword(connection, savedPassword)
+                    this.passwordStorage.savePassword(session.connection, savedPassword)
                 }
                 this.zone.run(resolve)
             })
             ssh.on('error', error => {
-                this.passwordStorage.deletePassword(connection)
+                this.passwordStorage.deletePassword(session.connection)
                 this.zone.run(() => {
                     if (connected) {
                         this.toastr.error(error.toString())
@@ -86,7 +111,8 @@ export class SSHService {
                 })
             })
             ssh.on('keyboard-interactive', (name, instructions, instructionsLang, prompts, finish) => this.zone.run(async () => {
-                console.log(name, instructions, instructionsLang)
+                log(`Keyboard-interactive auth requested: ${name}`)
+                this.logger.info('Keyboard-interactive auth:', name, instructions, instructionsLang)
                 let results = []
                 for (let prompt of prompts) {
                     let modal = this.ngbModal.open(PromptModalComponent)
@@ -97,55 +123,85 @@ export class SSHService {
                 finish(results)
             }))
 
+            ssh.on('greeting', greeting => {
+                log('Greeting: ' + greeting)
+            })
+
+            ssh.on('banner', banner => {
+                log('Banner: ' + banner)
+            })
+
             let agent: string = null
             if (this.hostApp.platform === Platform.Windows) {
-                agent = 'pageant'
+                let pageantRunning = new Promise<boolean>(resolve => {
+                    windowsProcessTree.getProcessList(list => {
+                        resolve(list.some(x => x.name === 'pageant.exe'))
+                    }, 0)
+                })
+                if (await pageantRunning) {
+                    agent = 'pageant'
+                }
             } else {
                 agent = process.env.SSH_AUTH_SOCK
             }
 
-            ssh.connect({
+            try {
-                host: connection.host,
+                ssh.connect({
-                port: connection.port || 22,
+                    host: session.connection.host,
-                username: connection.user,
+                    port: session.connection.port || 22,
-                password: connection.privateKey ? undefined : '',
+                    username: session.connection.user,
-                privateKey,
+                    password: session.connection.privateKey ? undefined : '',
-                passphrase: privateKeyPassphrase,
+                    privateKey,
-                tryKeyboard: true,
+                    passphrase: privateKeyPassphrase,
-                agent,
+                    tryKeyboard: true,
-                agentForward: !!agent,
+                    agent,
-                keepaliveInterval: connection.keepaliveInterval,
+                    agentForward: !!agent,
-                keepaliveCountMax: connection.keepaliveCountMax,
+                    keepaliveInterval: session.connection.keepaliveInterval,
-                readyTimeout: connection.readyTimeout,
+                    keepaliveCountMax: session.connection.keepaliveCountMax,
-            })
+                    readyTimeout: session.connection.readyTimeout,
+                    hostVerifier: digest => {
+                        log('SHA256 fingerprint: ' + digest)
+                        return true
+                    },
+                    hostHash: 'sha256' as any,
+                    algorithms: session.connection.algorithms,
+                })
+            } catch (e) {
+                this.toastr.error(e.message)
+                reject(e)
+            }
 
             let keychainPasswordUsed = false
 
             ;(ssh as any).config.password = () => this.zone.run(async () => {
-                if (connection.password) {
+                if (session.connection.password) {
-                    this.logger.info('Using preset password')
+                    log('Using preset password')
-                    return connection.password
+                    return session.connection.password
                 }
 
                 if (!keychainPasswordUsed) {
-                    let password = await this.passwordStorage.loadPassword(connection)
+                    let password = await this.passwordStorage.loadPassword(session.connection)
                     if (password) {
-                        this.logger.info('Using saved password')
+                        log('Trying saved password')
                         keychainPasswordUsed = true
                         return password
                     }
                 }
 
                 let modal = this.ngbModal.open(PromptModalComponent)
-                modal.componentInstance.prompt = `Password for ${connection.user}@${connection.host}`
+                modal.componentInstance.prompt = `Password for ${session.connection.user}@${session.connection.host}`
                 modal.componentInstance.password = true
-                savedPassword = await modal.result
+                try {
+                    savedPassword = await modal.result
+                } catch (_) {
+                    return ''
+                }
                 return savedPassword
             })
         })
 
         try {
-            let shell = await new Promise((resolve, reject) => {
+            let shell: any = await new Promise<any>((resolve, reject) => {
                 ssh.shell({ term: 'xterm-256color' }, (err, shell) => {
                     if (err) {
                         reject(err)
@@ -155,14 +211,17 @@ export class SSHService {
                 })
             })
 
-            let session = new SSHSession(shell, connection)
+            session.shell = shell
 
-            return this.zone.run(() => this.app.openNewTab(
+            shell.on('greeting', greeting => {
-                TerminalTabComponent,
+                log('Shell Greeting: ' + greeting)
-                { session, sessionOptions: {} }
+            })
-            ) as TerminalTabComponent)
+
+            shell.on('banner', banner => {
+                log('Shell Banner: ' + banner)
+            })
         } catch (error) {
-            console.log(error)
+            this.toastr.error(error.message)
             throw error
         }
     }

terminus-ssh/src/settings.ts

@@ -6,6 +6,7 @@ import { SSHSettingsTabComponent } from './components/sshSettingsTab.component'
 @Injectable()
 export class SSHSettingsTabProvider extends SettingsTabProvider {
     id = 'ssh'
+    icon = 'globe'
     title = 'SSH'
 
     getComponentType (): any {

terminus-ssh/webpack.config.js

@@ -12,7 +12,7 @@ module.exports = {
     libraryTarget: 'umd',
     devtoolModuleFilenameTemplate: 'webpack-terminus-ssh:///[resource-path]',
   },
-  mode: process.env.DEV ? 'development' : 'production',
+  mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   optimization:{
      minimize: false,
   },
@@ -44,10 +44,12 @@ module.exports = {
   externals: [
     'fs',
     'node-ssh',
+    'ssh2-streams',
     'xkeychain',
     'wincredmgr',
     'path',
     'ngx-toastr',
+    'windows-process-tree/build/Release/windows_process_tree.node',
     /^rxjs/,
     /^@angular/,
     /^@ng-bootstrap/,

terminus-terminal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-terminal",
-  "version": "1.0.0-alpha.55",
+  "version": "1.0.68-c17-g8b64a81",
   "description": "Terminus' terminal emulation core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -17,7 +17,6 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
-    "@terminus-term/xterm": "3.8.4",
     "@types/deep-equal": "^1.0.0",
     "@types/mz": "0.0.31",
     "@types/node": "7.0.12",
@@ -25,8 +24,9 @@
     "dataurl": "0.1.0",
     "deep-equal": "1.0.1",
     "file-loader": "^0.11.2",
-    "rage-edit-tmp": "^1.1.0",
+    "rage-edit": "1.2.0",
     "uuid": "^3.3.2",
+    "xterm": "3.10.1",
     "xterm-addon-ligatures-tmp": "^0.1.0-beta-1"
   },
   "peerDependencies": {
@@ -40,12 +40,10 @@
     "terminus-settings": "*"
   },
   "dependencies": {
-    "@types/async-lock": "0.0.19",
-    "async-lock": "^1.0.0",
     "font-manager": "0.3.0",
     "hterm-umdjs": "1.4.1",
     "mz": "^2.6.0",
-    "node-pty-tmp": "0.7.2",
+    "node-pty": "^0.8.0",
     "ps-node": "^0.1.6",
     "runes": "^0.4.2"
   },

terminus-terminal/src/api.ts

@@ -1,11 +1,10 @@
-import { Observable } from 'rxjs'
+import { BaseTerminalTabComponent } from './components/baseTerminalTab.component'
-import { TerminalTabComponent } from './components/terminalTab.component'
 
 export abstract class TerminalDecorator {
     // tslint:disable-next-line no-empty
-    attach (_terminal: TerminalTabComponent): void { }
+    attach (_terminal: BaseTerminalTabComponent): void { }
     // tslint:disable-next-line no-empty
-    detach (_terminal: TerminalTabComponent): void { }
+    detach (_terminal: BaseTerminalTabComponent): void { }
 }
 
 export interface ResizeEvent {
@@ -15,25 +14,19 @@ export interface ResizeEvent {
 
 export interface SessionOptions {
     name?: string
-    command?: string
+    command: string
-    args?: string[]
+    args: string[]
     cwd?: string
     env?: any
     width?: number
     height?: number
-    recoveryId?: string
-    recoveredTruePID$?: Observable<number>
     pauseAfterExit?: boolean
+    runAsAdministrator?: boolean
 }
 
-export abstract class SessionPersistenceProvider {
+export interface Profile {
-    abstract id: string
+    name: string,
-    abstract displayName: string
+    sessionOptions: SessionOptions,
-
-    abstract isAvailable (): boolean
-    abstract async attachSession (recoveryId: any): Promise<SessionOptions>
-    abstract async startSession (options: SessionOptions): Promise<any>
-    abstract async terminateSession (recoveryId: string): Promise<void>
 }
 
 export interface ITerminalColorScheme {
@@ -48,6 +41,12 @@ export abstract class TerminalColorSchemeProvider {
     abstract async getSchemes (): Promise<ITerminalColorScheme[]>
 }
 
+export abstract class TerminalContextMenuItemProvider {
+    weight: number
+
+    abstract async getItems (tab: BaseTerminalTabComponent): Promise<Electron.MenuItemConstructorOptions[]>
+}
+
 export interface IShell {
     id: string
     name?: string

terminus-terminal/src/buttonProvider.ts

@@ -15,7 +15,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
         hotkeys: HotkeysService,
     ) {
         super()
-        if (!electron.remote.process.env.DEV) {
+        if (!electron.remote.process.env.TERMINUS_DEV) {
             setImmediate(async () => {
                 let argv: string[] = electron.remote.process.argv
                 for (let arg of argv.slice(1).concat([electron.remote.process.argv0])) {

terminus-terminal/src/components/appearanceSettingsTab.component.pug

@@ -1,6 +1,6 @@
 h3.mb-3 Appearance
-.row
+.d-flex
-    .col-md-6
+    .mr-5
         .form-line
             .header
                 .title Frontend
@@ -26,6 +26,7 @@ h3.mb-3 Appearance
                 )
                 input.form-control.w-25(
                     type='number',
+                    max='48',
                     [(ngModel)]='config.store.terminal.fontSize',
                     (ngModelChange)='config.save()',
                 )
@@ -57,7 +58,7 @@ h3.mb-3 Appearance
                         (click)='deleteScheme(config.store.terminal.colorScheme)',
                         *ngIf='isCustomScheme(config.store.terminal.colorScheme)'
                     )
-                        i.fa.fa-trash-o
+                        i.fas.fa-trash
 
         .form-group(*ngIf='editingColorScheme')
             label Editing
@@ -91,7 +92,7 @@ h3.mb-3 Appearance
                 [title]='idx',
             )
 
-    .col-md-6
+    div
         .form-group
             .appearance-preview(
                 [style.font-family]='config.store.terminal.font',

terminus-terminal/src/components/appearanceSettingsTab.component.scss

@@ -3,6 +3,9 @@
     margin-left: 20px;
     padding: 10px;
     overflow: hidden;
+    max-width: 400px;
+    max-height: 400px;
+
     span {
         white-space: pre;
     }

terminus-terminal/src/components/appearanceSettingsTab.component.ts

@@ -5,7 +5,7 @@ import deepEqual = require('deep-equal')
 const fontManager = require('font-manager')
 
 import { Component, Inject } from '@angular/core'
-import { ConfigService, HostAppService, Platform } from 'terminus-core'
+import { ConfigService, HostAppService, Platform, ElectronService } from 'terminus-core'
 import { TerminalColorSchemeProvider, ITerminalColorScheme } from '../api'
 
 @Component({
@@ -22,6 +22,7 @@ export class AppearanceSettingsTabComponent {
     constructor (
         @Inject(TerminalColorSchemeProvider) private colorSchemeProviders: TerminalColorSchemeProvider[],
         private hostApp: HostAppService,
+        private electron: ElectronService,
         public config: ConfigService,
     ) { }
 
@@ -71,8 +72,16 @@ export class AppearanceSettingsTabComponent {
         this.editingColorScheme = null
     }
 
-    deleteScheme (scheme: ITerminalColorScheme) {
+    async deleteScheme (scheme: ITerminalColorScheme) {
-        if (confirm(`Delete "${scheme.name}"?`)) {
+        if ((await this.electron.showMessageBox(
+            this.hostApp.getWindow(),
+            {
+                type: 'warning',
+                message: `Delete "${scheme.name}"?`,
+                buttons: ['Keep', 'Delete'],
+                defaultId: 1,
+            }
+        )).response === 1) {
             let schemes = this.config.store.terminal.customColorSchemes
             schemes = schemes.filter(x => x !== scheme)
             this.config.store.terminal.customColorSchemes = schemes

terminus-terminal/src/components/baseTerminalTab.component.ts

@@ -0,0 +1,374 @@
+import { Observable, Subject, Subscription } from 'rxjs'
+import { first } from 'rxjs/operators'
+import { ToastrService } from 'ngx-toastr'
+import { NgZone, OnInit, OnDestroy, Inject, Injector, Optional, ViewChild, HostBinding, Input, ElementRef } from '@angular/core'
+import { AppService, ConfigService, BaseTabComponent, ElectronService, HostAppService, HotkeysService, Platform, LogService, Logger } from 'terminus-core'
+
+import { BaseSession, SessionsService } from '../services/sessions.service'
+import { TerminalFrontendService } from '../services/terminalFrontend.service'
+
+import { TerminalDecorator, ResizeEvent, TerminalContextMenuItemProvider } from '../api'
+import { Frontend } from '../frontends/frontend'
+
+export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit, OnDestroy {
+    static template = `
+        <div
+            #content
+            class="content"
+            [style.opacity]="htermVisible ? 1 : 0"
+        ></div>
+    `
+    static styles = [require('./terminalTab.component.scss')]
+
+    session: BaseSession
+    @Input() zoom = 0
+    @ViewChild('content') content
+    @HostBinding('style.background-color') backgroundColor: string
+    @HostBinding('class.top-padded') topPadded: boolean
+    frontend: Frontend
+    sessionCloseSubscription: Subscription
+    hotkeysSubscription: Subscription
+    htermVisible = false
+    frontendReady = new Subject<void>()
+    size: ResizeEvent
+    protected logger: Logger
+    protected output = new Subject<string>()
+    private bellPlayer: HTMLAudioElement
+    private termContainerSubscriptions: Subscription[] = []
+
+    get input$ (): Observable<string> { return this.frontend.input$ }
+    get output$ (): Observable<string> { return this.output }
+    get resize$ (): Observable<ResizeEvent> { return this.frontend.resize$ }
+    get alternateScreenActive$ (): Observable<boolean> { return this.frontend.alternateScreenActive$ }
+    get frontendReady$ (): Observable<void> { return this.frontendReady }
+
+    constructor (
+        public config: ConfigService,
+        public element: ElementRef,
+        protected injector: Injector,
+        protected zone: NgZone,
+        protected app: AppService,
+        protected hostApp: HostAppService,
+        protected hotkeys: HotkeysService,
+        protected sessions: SessionsService,
+        protected electron: ElectronService,
+        protected terminalContainersService: TerminalFrontendService,
+        protected toastr: ToastrService,
+        protected log: LogService,
+        @Optional() @Inject(TerminalDecorator) protected decorators: TerminalDecorator[],
+        @Optional() @Inject(TerminalContextMenuItemProvider) protected contextMenuProviders: TerminalContextMenuItemProvider[],
+    ) {
+        super()
+        this.logger = log.create('baseTerminalTab')
+        this.decorators = this.decorators || []
+        this.setTitle('Terminal')
+
+        this.hotkeysSubscription = this.hotkeys.matchedHotkey.subscribe(hotkey => {
+            if (!this.hasFocus) {
+                return
+            }
+            switch (hotkey) {
+            case 'ctrl-c':
+                if (this.frontend.getSelection()) {
+                    this.frontend.copySelection()
+                    this.frontend.clearSelection()
+                    this.toastr.info('Copied')
+                } else {
+                    this.sendInput('\x03')
+                }
+                break
+            case 'copy':
+                this.frontend.copySelection()
+                this.toastr.info('Copied')
+                break
+            case 'paste':
+                this.paste()
+                break
+            case 'clear':
+                this.frontend.clear()
+                break
+            case 'zoom-in':
+                this.zoomIn()
+                break
+            case 'zoom-out':
+                this.zoomOut()
+                break
+            case 'reset-zoom':
+                this.resetZoom()
+                break
+            case 'home':
+                this.sendInput('\x1bOH')
+                break
+            case 'end':
+                this.sendInput('\x1bOF')
+                break
+            case 'previous-word':
+                this.sendInput('\x1bb')
+                break
+            case 'next-word':
+                this.sendInput('\x1bf')
+                break
+            case 'delete-previous-word':
+                this.sendInput('\x1b\x7f')
+                break
+            case 'delete-next-word':
+                this.sendInput('\x1bd')
+                break
+            }
+        })
+        this.bellPlayer = document.createElement('audio')
+        this.bellPlayer.src = require<string>('../bell.ogg')
+
+        this.contextMenuProviders.sort((a, b) => a.weight - b.weight)
+    }
+
+    ngOnInit () {
+        this.focused$.subscribe(() => {
+            this.configure()
+            this.frontend.focus()
+        })
+
+        this.frontend = this.terminalContainersService.getFrontend(this.session)
+
+        this.frontend.ready$.subscribe(() => {
+            this.htermVisible = true
+        })
+
+        this.frontend.resize$.pipe(first()).subscribe(async ({ columns, rows }) => {
+            this.size = { columns, rows }
+            this.frontendReady.next()
+
+            setTimeout(() => {
+                this.session.resize(columns, rows)
+            }, 1000)
+
+            this.session.releaseInitialDataBuffer()
+        })
+
+        this.frontend.configure()
+
+        if (this.hasFocus) {
+            this.frontend.attach(this.content.nativeElement)
+        } else {
+            this.focused$.pipe(first()).subscribe(() => {
+                this.frontend.attach(this.content.nativeElement)
+            })
+        }
+
+        this.attachTermContainerHandlers()
+
+        this.configure()
+
+        this.config.enabledServices(this.decorators).forEach((decorator) => {
+            decorator.attach(this)
+        })
+
+        setTimeout(() => {
+            this.output.subscribe(() => {
+                this.displayActivity()
+            })
+        }, 1000)
+
+        this.frontend.bell$.subscribe(() => {
+            if (this.config.store.terminal.bell === 'visual') {
+                this.frontend.visualBell()
+            }
+            if (this.config.store.terminal.bell === 'audible') {
+                this.bellPlayer.play()
+            }
+        })
+
+        this.frontend.focus()
+    }
+
+    async buildContextMenu (): Promise<Electron.MenuItemConstructorOptions[]> {
+        let items: Electron.MenuItemConstructorOptions[] = []
+        for (let section of await Promise.all(this.contextMenuProviders.map(x => x.getItems(this)))) {
+            items = items.concat(section)
+            items.push({ type: 'separator' })
+        }
+        items.splice(items.length - 1, 1)
+        return items
+    }
+
+    detachTermContainerHandlers () {
+        for (let subscription of this.termContainerSubscriptions) {
+            subscription.unsubscribe()
+        }
+        this.termContainerSubscriptions = []
+    }
+
+    attachTermContainerHandlers () {
+        this.detachTermContainerHandlers()
+        this.termContainerSubscriptions = [
+            this.frontend.title$.subscribe(title => this.zone.run(() => this.setTitle(title))),
+
+            this.focused$.subscribe(() => this.frontend.enableResizing = true),
+            this.blurred$.subscribe(() => this.frontend.enableResizing = false),
+
+            this.frontend.mouseEvent$.subscribe(async event => {
+                if (event.type === 'mousedown') {
+                    if (event.which === 2) {
+                        this.paste()
+                        event.preventDefault()
+                        event.stopPropagation()
+                        return
+                    }
+                    if (event.which === 3) {
+                        if (this.config.store.terminal.rightClick === 'menu') {
+                            this.hostApp.popupContextMenu(await this.buildContextMenu())
+                        } else if (this.config.store.terminal.rightClick === 'paste') {
+                            this.paste()
+                        }
+                        event.preventDefault()
+                        event.stopPropagation()
+                        return
+                    }
+                }
+                if (event.type === 'mousewheel') {
+                    let wheelDeltaY = 0
+
+                    if ('wheelDeltaY' in event) {
+                        wheelDeltaY = (event as MouseWheelEvent)['wheelDeltaY']
+                    } else {
+                        wheelDeltaY = (event as MouseWheelEvent)['deltaY']
+                    }
+                    if (event.ctrlKey || event.metaKey) {
+
+                        if (wheelDeltaY > 0) {
+                            this.zoomIn()
+                        } else {
+                            this.zoomOut()
+                        }
+                    } else if (event.altKey) {
+                        event.preventDefault()
+                        let delta = Math.round(wheelDeltaY / 50)
+                        this.sendInput(((delta > 0) ? '\u001bOA' : '\u001bOB').repeat(Math.abs(delta)))
+                    }
+                }
+            }),
+
+            this.frontend.input$.subscribe(data => {
+                this.sendInput(data)
+            }),
+
+            this.frontend.resize$.subscribe(({ columns, rows }) => {
+                this.logger.debug(`Resizing to ${columns}x${rows}`)
+                this.size = { columns, rows }
+                this.zone.run(() => {
+                    if (this.session && this.session.open) {
+                        this.session.resize(columns, rows)
+                    }
+                })
+            }),
+
+            this.hostApp.windowMoved$.subscribe(() => setTimeout(() => {
+                this.configure()
+            }, 250)),
+
+            this.hostApp.displayMetricsChanged$.subscribe(() => setTimeout(() => {
+                this.configure()
+            }, 250)),
+        ]
+    }
+
+    sendInput (data: string) {
+        this.session.write(data)
+        if (this.config.store.terminal.scrollOnInput) {
+            this.frontend.scrollToBottom()
+        }
+    }
+
+    write (data: string) {
+        let percentageMatch = /(^|[^\d])(\d+(\.\d+)?)%([^\d]|$)/.exec(data)
+        if (percentageMatch) {
+            let percentage = percentageMatch[3] ? parseFloat(percentageMatch[2]) : parseInt(percentageMatch[2])
+            if (percentage > 0 && percentage <= 100) {
+                this.setProgress(percentage)
+                this.logger.debug('Detected progress:', percentage)
+            }
+        } else {
+            this.setProgress(null)
+        }
+        this.frontend.write(data)
+    }
+
+    paste () {
+        let data = this.electron.clipboard.readText()
+        if (this.config.store.terminal.bracketedPaste) {
+            data = '\x1b[200~' + data + '\x1b[201~'
+        }
+        if (this.hostApp.platform === Platform.Windows) {
+            data = data.replace(/\r\n/g, '\r')
+        } else {
+            data = data.replace(/\n/g, '\r')
+        }
+        this.sendInput(data)
+    }
+
+    configure (): void {
+        this.frontend.configure()
+
+        this.topPadded = this.hostApp.platform === Platform.macOS
+            && this.config.store.appearance.frame === 'thin'
+            && this.config.store.appearance.tabsLocation === 'bottom'
+
+        if (this.config.store.terminal.background === 'colorScheme') {
+            if (this.config.store.terminal.colorScheme.background) {
+                this.backgroundColor = this.config.store.terminal.colorScheme.background
+            }
+        } else {
+            this.backgroundColor = null
+        }
+    }
+
+    zoomIn () {
+        this.zoom++
+        this.frontend.setZoom(this.zoom)
+    }
+
+    zoomOut () {
+        this.zoom--
+        this.frontend.setZoom(this.zoom)
+    }
+
+    resetZoom () {
+        this.zoom = 0
+        this.frontend.setZoom(this.zoom)
+    }
+
+    ngOnDestroy () {
+        this.frontend.detach(this.content.nativeElement)
+        this.detachTermContainerHandlers()
+        this.config.enabledServices(this.decorators).forEach(decorator => {
+            decorator.detach(this)
+        })
+        this.hotkeysSubscription.unsubscribe()
+        if (this.sessionCloseSubscription) {
+            this.sessionCloseSubscription.unsubscribe()
+        }
+        this.output.complete()
+    }
+
+    async destroy () {
+        super.destroy()
+        if (this.session && this.session.open) {
+            await this.session.destroy()
+        }
+    }
+
+    protected attachSessionHandlers () {
+        // this.session.output$.bufferTime(10).subscribe((datas) => {
+        this.session.output$.subscribe(data => {
+            this.zone.run(() => {
+                this.output.next(data)
+                this.write(data)
+            })
+        })
+
+        this.sessionCloseSubscription = this.session.closed$.subscribe(() => {
+            this.frontend.destroy()
+            this.app.closeTab(this)
+        })
+    }
+}

terminus-terminal/src/components/editProfileModal.component.pug

@@ -0,0 +1,58 @@
+.modal-body
+    .form-group
+        label Name
+        input.form-control(
+            type='text', 
+            autofocus, 
+            [(ngModel)]='profile.name', 
+        )
+
+    .form-group
+        label Command
+        input.form-control(
+            type='text', 
+            [(ngModel)]='profile.sessionOptions.command', 
+        )
+    
+    .form-group
+        label Arguments
+        .input-group(
+            *ngFor='let arg of profile.sessionOptions.args; index as i; trackBy: trackByIndex',
+        )
+            input.form-control(
+                type='text', 
+                [(ngModel)]='profile.sessionOptions.args[i]', 
+            )
+            .input-group-btn
+                button.btn.btn-secondary((click)='profile.sessionOptions.args.splice(i, 1)')
+                    i.fas.fa-trash
+        
+        .mt-2
+            button.btn.btn-secondary((click)='profile.sessionOptions.args.push("")')
+                i.fas.fa-plus.mr-2
+                | Add
+        
+    .form-line(*ngIf='uac.isAvailable')
+        .header
+            .title Run as administrator
+        toggle(
+            [(ngModel)]='profile.sessionOptions.runAsAdministrator',
+        )
+        
+    .form-group
+        label Working directory
+        input.form-control(
+            type='text', 
+            [(ngModel)]='profile.sessionOptions.cwd', 
+        )
+
+    .form-group
+        label Environment
+        environment-editor(
+            type='text', 
+            [(model)]='profile.sessionOptions.env', 
+        )
+
+.modal-footer
+    button.btn.btn-outline-primary((click)='save()') Save
+    button.btn.btn-outline-danger((click)='cancel()') Cancel

terminus-terminal/src/components/editProfileModal.component.ts

@@ -0,0 +1,34 @@
+import { Component } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { UACService } from '../services/uac.service'
+import { Profile } from '../api'
+
+@Component({
+    template: require('./editProfileModal.component.pug'),
+})
+export class EditProfileModalComponent {
+    profile: Profile
+
+    constructor (
+        public uac: UACService,
+        private modalInstance: NgbActiveModal,
+    ) {
+    }
+
+    ngOnInit () {
+        this.profile.sessionOptions.env = this.profile.sessionOptions.env || {}
+        this.profile.sessionOptions.args = this.profile.sessionOptions.args || []
+    }
+
+    save () {
+        this.modalInstance.close(this.profile)
+    }
+
+    cancel () {
+        this.modalInstance.dismiss()
+    }
+
+    trackByIndex (index) {
+        return index
+    }
+}

terminus-terminal/src/components/environmentEditor.component.pug

@@ -0,0 +1,12 @@
+.mb-2.d-flex.align-items-center(*ngFor='let pair of vars')
+    .input-group.w-50
+        input.form-control([(ngModel)]='pair.key', (blur)='emitUpdate()', placeholder='Variable name')
+        .input-group-append 
+            .input-group-text =
+    input.form-control.w-50.mr-1([(ngModel)]='pair.value', (blur)='emitUpdate()', placeholder='Value')
+    button.btn.btn-secondary((click)='removeEnvironmentVar(pair.key)')
+        i.fas.fa-trash
+        
+button.btn.btn-secondary((click)='addEnvironmentVar()')
+    i.fas.fa-plus.mr-2
+    span Add

terminus-terminal/src/components/environmentEditor.component.scss

@@ -0,0 +1,3 @@
+:host {
+    display: block;
+}