fixed wsl shell provider

Bump keytar from 5.0.0 to 5.1.0 in /app

.all-contributorsrc

@@ -234,6 +234,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "CyrilTaylor",
+      "name": "Cyril Taylor",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12631466?v=4",
+      "profile": "https://github.com/CyrilTaylor",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.yml

@@ -79,6 +79,7 @@ rules:
       args: after-used
       argsIgnorePattern: ^_
   no-undef: error
+  no-var: error
   object-curly-spacing:
   - error
   - always

README.md

@@ -13,12 +13,13 @@
 
 **Terminus** is a highly configurable terminal emulator for Windows, macOS and Linux
 
+  * Integrated SSH client and connection manager
   * Theming and color schemes
   * Fully configurable shortcuts
   * Split panes
   * Remembers your tabs
   * PowerShell (and PS Core), WSL, Git-Bash, Cygwin, Cmder and CMD support
-  * Integrated SSH client and connection manager
+  * Direct file transfer from/to SSH sessions via Zmodem
   * Full Unicode support including double-width characters
   * Doesn't choke on fast-flowing outputs
   * Proper shell experience on Windows including tab completion (via Clink)
@@ -39,7 +40,6 @@
 Plugins and themes can be installed directly from the Settings view inside Terminus.
 
   * [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
-  * [shell-selector](https://github.com/Eugeny/terminus-shell-selector) - a quick shell selector pane
   * [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
   * [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
@@ -101,6 +101,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4" width="100px;" alt=""/><br /><sub><b>Chris Kaczor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ckaczor" title="Code">💻</a></td>
     <td align="center"><a href="https://www.boxmein.net"><img src="https://avatars1.githubusercontent.com/u/358714?v=4" width="100px;" alt=""/><br /><sub><b>Johannes Kadak</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=boxmein" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/LeSeulArtichaut"><img src="https://avatars1.githubusercontent.com/u/38361244?v=4" width="100px;" alt=""/><br /><sub><b>LeSeulArtichaut</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=LeSeulArtichaut" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/CyrilTaylor"><img src="https://avatars0.githubusercontent.com/u/12631466?v=4" width="100px;" alt=""/><br /><sub><b>Cyril Taylor</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=CyrilTaylor" title="Code">💻</a></td>
   </tr>
 </table>
 

app/lib/app.ts

@@ -1,4 +1,5 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
+// eslint-disable-next-line no-duplicate-imports
 import * as electron from 'electron'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
@@ -23,6 +24,7 @@ export class Application {
 
         app.commandLine.appendSwitch('disable-http-cache')
         app.commandLine.appendSwitch('lang', 'EN')
+        app.allowRendererProcessReuse = false
 
         for (const flag of configData.flags || [['force_discrete_gpu', '0']]) {
             app.commandLine.appendSwitch(flag[0], flag[1])
@@ -74,7 +76,7 @@ export class Application {
             this.tray = new Tray(`${app.getAppPath()}/assets/tray.png`)
         }
 
-        this.tray.on('click', () => setTimeout(() => this.focus()));
+        this.tray.on('click', () => setTimeout(() => this.focus()))
 
         const contextMenu = Menu.buildFromTemplate([{
             label: 'Show',
@@ -185,7 +187,7 @@ export class Application {
                         },
                     },
                 ],
-            }
+            },
         ]
 
         Menu.setApplicationMenu(Menu.buildFromTemplate(template))

app/lib/cli.ts

@@ -20,25 +20,25 @@ export function parseArgs (argv, cwd) {
             return yargs.option('escape', {
                 alias: 'e',
                 type: 'boolean',
-                describe: 'Perform shell escaping'
+                describe: 'Perform shell escaping',
             }).positional('text', {
-                type: 'string'
+                type: 'string',
             })
         })
         .version('version', '', app.getVersion())
         .option('debug', {
             alias: 'd',
             describe: 'Show DevTools on start',
-            type: 'boolean'
+            type: 'boolean',
         })
         .option('hidden', {
             describe: 'Start minimized',
-            type: 'boolean'
+            type: 'boolean',
         })
         .option('version', {
             alias: 'v',
             describe: 'Show version and exit',
-            type: 'boolean'
+            type: 'boolean',
         })
         .help('help')
         .parse(argv.slice(1))

app/lib/index.ts

@@ -1,3 +1,4 @@
+import './portable'
 import './sentry'
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
@@ -58,8 +59,8 @@ app.on('ready', () => {
                 label: 'New window',
                 click () {
                     this.app.newWindow()
-                }
-            }
+                },
+            },
         ]))
     }
     application.init()

app/lib/lru.ts

@@ -1,13 +1,15 @@
-let lru = require('lru-cache')({ max: 256, maxAge: 250 })
-
-let fs = require('fs')
-let origLstat = fs.realpathSync.bind(fs)
+import * as createLRU from 'lru-cache'
+import * as fs from 'fs'
+const lru = createLRU({ max: 256, maxAge: 250 })
+const origLstat = fs.realpathSync.bind(fs)
 
 // NB: The biggest offender of thrashing realpathSync is the node module system
 // itself, which we can't get into via any sane means.
 require('fs').realpathSync = function (p) {
     let r = lru.get(p)
-    if (r) return r
+    if (r) {
+        return r
+    }
 
     r = origLstat(p)
     lru.set(p, r)

app/lib/portable.ts

@@ -0,0 +1,15 @@
+import * as path from 'path'
+import * as fs from 'fs'
+
+if (process.env.PORTABLE_EXECUTABLE_DIR) {
+    const portableData = path.join(process.env.PORTABLE_EXECUTABLE_DIR, 'terminus-data')
+    if (!fs.existsSync(portableData)) {
+        fs.mkdirSync(portableData)
+    }
+
+    try {
+        require('electron').app.setPath('userData', portableData)
+    } catch {
+        require('electron').remote.app.setPath('userData', portableData)
+    }
+}

app/lib/sentry.ts

@@ -1,4 +1,5 @@
 const { init } = process.type === 'main' ? require('@sentry/electron/dist/main') : require('@sentry/electron/dist/renderer')
+import * as isDev from 'electron-is-dev'
 
 
 const SENTRY_DSN = 'https://4717a0a7ee0b4429bd3a0f06c3d7eec3@sentry.io/181876'
@@ -9,10 +10,12 @@ try {
     release = require('electron').remote.app.getVersion()
 }
 
-init({
-    dsn: SENTRY_DSN,
-    release,
-    integrations (integrations) {
-        return integrations.filter(integration => integration.name !== 'Breadcrumbs')
-    },
-})
+if (!isDev) {
+    init({
+        dsn: SENTRY_DSN,
+        release,
+        integrations (integrations) {
+            return integrations.filter(integration => integration.name !== 'Breadcrumbs')
+        },
+    })
+}

app/lib/window.ts

@@ -27,6 +27,8 @@ export class Window {
     private windowConfig: ElectronConfig
     private windowBounds: Rectangle
     private closing = false
+    private lastVibrancy: {enabled: boolean, type?: string} | null = null
+    private disableVibrancyWhileDragging = false
 
     get visible$ (): Observable<boolean> { return this.visible }
 
@@ -48,6 +50,7 @@ export class Window {
             webPreferences: {
                 nodeIntegration: true,
                 preload: path.join(__dirname, 'sentry.js'),
+                backgroundThrottling: false,
             },
             frame: false,
             show: false,
@@ -56,14 +59,14 @@ export class Window {
 
         if (this.windowBounds) {
             Object.assign(bwOptions, this.windowBounds)
-            const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} )
+            const closestDisplay = screen.getDisplayNearestPoint( { x: this.windowBounds.x, y: this.windowBounds.y } )
 
-            const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height];
-            const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height];
+            const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]
+            const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]
 
             if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) {
-                bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2;
-                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2;
+                bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2
+                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2
             }
         }
 
@@ -117,11 +120,12 @@ export class Window {
     }
 
     setVibrancy (enabled: boolean, type?: string) {
+        this.lastVibrancy = { enabled, type }
         if (process.platform === 'win32') {
             if (parseFloat(os.release()) >= 10) {
                 let attribValue = AccentState.ACCENT_DISABLED
                 if (enabled) {
-                    if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
+                    if (type === 'fluent') {
                         attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
                     } else {
                         attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
@@ -131,6 +135,8 @@ export class Window {
             } else {
                 DwmEnableBlurBehindWindow(this.window, enabled)
             }
+        } else {
+            this.window.setVibrancy(enabled ? 'dark' : null as any) // electron issue 20269
         }
     }
 
@@ -150,7 +156,7 @@ export class Window {
     }
 
     isDestroyed () {
-        return !this.window || this.window.isDestroyed();
+        return !this.window || this.window.isDestroyed()
     }
 
     private setupWindowManagement () {
@@ -202,6 +208,10 @@ export class Window {
             }
         })
 
+        this.window.on('focus', () => {
+            this.send('host:window-focused')
+        })
+
         ipcMain.on('window-focus', event => {
             if (!this.window || event.sender !== this.window.webContents) {
                 return
@@ -289,6 +299,29 @@ export class Window {
         })
 
         this.window.webContents.on('new-window', event => event.preventDefault())
+
+        ipcMain.on('window-set-disable-vibrancy-while-dragging', (_event, value) => {
+            this.disableVibrancyWhileDragging = value
+        })
+
+        this.window.on('will-move', () => {
+            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
+                return
+            }
+            let timeout: number|null = null
+            const oldVibrancy = this.lastVibrancy
+            this.setVibrancy(false)
+            const onMove = () => {
+                if (timeout) {
+                    clearTimeout(timeout)
+                }
+                timeout = setTimeout(() => {
+                    this.window.off('move', onMove)
+                    this.setVibrancy(oldVibrancy.enabled, oldVibrancy.type)
+                }, 500)
+            }
+            this.window.on('move', onMove)
+        })
     }
 
     private destroy () {

app/package.json

@@ -28,15 +28,15 @@
     "electron-updater": "^4.2.0",
     "fontmanager-redux": "0.4.0",
     "js-yaml": "3.13.1",
-    "keytar": "^5.0.0",
+    "keytar": "^5.1.0",
     "mz": "^2.7.0",
     "ngx-toastr": "^10.2.0",
     "node-pty": "^0.10.0-beta2",
     "npm": "6.9.0",
     "path": "0.12.7",
-    "rxjs": "^6.5.3",
-    "rxjs-compat": "^6.5.3",
-    "yargs": "^15.0.2",
+    "rxjs": "^6.5.4",
+    "rxjs-compat": "^6.5.4",
+    "yargs": "^15.1.0",
     "zone.js": "^0.8.29"
   },
   "optionalDependencies": {

app/src/entry.ts

@@ -7,7 +7,8 @@ import * as isDev from 'electron-is-dev'
 import './global.scss'
 import './toastr.scss'
 
-import { enableProdMode, NgModuleRef } from '@angular/core'
+import { enableProdMode, NgModuleRef, ApplicationRef } from '@angular/core'
+import { enableDebugTools } from '@angular/platform-browser'
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
 
 import { getRootModule } from './app.module'
@@ -37,7 +38,14 @@ async function bootstrap (plugins: PluginInfo[], safeMode = false): Promise<NgMo
     })
     const module = getRootModule(pluginsModules)
     window['rootModule'] = module
-    return platformBrowserDynamic().bootstrapModule(module)
+    return platformBrowserDynamic().bootstrapModule(module).then(moduleRef => {
+        if (isDev) {
+            const applicationRef = moduleRef.injector.get(ApplicationRef)
+            const componentRef = applicationRef.components[0]
+            enableDebugTools(componentRef)
+        }
+        return moduleRef
+    })
 }
 
 findPlugins().then(async plugins => {

app/src/plugins.ts

@@ -21,8 +21,7 @@ if (process.env.TERMINUS_DEV) {
 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'),
-    'terminus',
+    require('electron').remote.app.getPath('userData'),
     'plugins',
 )
 

app/yarn.lock

@@ -1485,10 +1485,10 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
-keytar@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.0.0.tgz#c89b6b7a4608fd7af633d9f8474b1a7eb97cbe6f"
-  integrity sha512-a5UheK59YOlJf9i+2Osaj/kkH6mK0RCHVMtJ84u6ZfbfRIbOJ/H4b5VlOF/LgNHF6s78dRSBzZnvIuPiBKv6wg==
+keytar@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/keytar/-/keytar-5.1.0.tgz#d572ed9250ff2b4c8d729621397e00b17bfa5581"
+  integrity sha512-SptCrRDqLbTeOMB2Z9UmVOS+OKguIrMft+EUaCB8xJPiFMjy6Jnmjgv/LA0rg1ENgLelzwSsC5PSQXF0uoqNDQ==
   dependencies:
     nan "2.14.0"
     prebuild-install "5.3.3"
@@ -2801,15 +2801,15 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs-compat@^6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.3.tgz#18440949b2678bf87a78a754009676b2c49183dc"
-  integrity sha512-BIJX2yovz3TBpjJoAZyls2QYuU6ZiCaZ+U96SmxQpuSP/qDUfiXPKOVLbThBB2WZijNHkdTTJXKRwvv5Y48H7g==
+rxjs-compat@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.4.tgz#03825692af3fe363e04c43f41ff4113d76bbd305"
+  integrity sha512-rkn+lbOHUQOurdd74J/hjmDsG9nFx0z66fvnbs8M95nrtKvNqCKdk7iZqdY51CGmDemTQk+kUPy4s8HVOHtkfA==
 
-rxjs@^6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
-  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
+rxjs@^6.5.4:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
+  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
   dependencies:
     tslib "^1.9.0"
 
@@ -3519,10 +3519,10 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^15.0.2:
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.2.tgz#4248bf218ef050385c4f7e14ebdf425653d13bd3"
-  integrity sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q==
+yargs@^15.1.0:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219"
+  integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==
   dependencies:
     cliui "^6.0.0"
     decamelize "^1.2.0"

build/linux/after-install.tpl

@@ -1,4 +1,7 @@
 #!/bin/bash
+cat > '/usr/bin/${executable}' << END
+#!/bin/sh
+'/opt/${productFilename}/${executable}' --no-sandbox $@
+END
 
-# Link to the binary
-ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'
+chmod +x '/usr/bin/${executable}'

electron-builder.yml

@@ -0,0 +1,62 @@
+---
+appId: org.terminus
+productName: Terminus
+compression: normal
+afterSign: "./build/mac/afterSignHook.js"
+files:
+- "**/*"
+- dist
+extraResources:
+- builtin-plugins
+- extras
+publish:
+- provider: github
+
+win:
+  icon: "./build/windows/icon.ico"
+  artifactName: terminus-${version}-setup.exe
+  rfc3161TimeStampServer: http://sha256timestamp.ws.symantec.com/sha256/timestamp
+nsis:
+  oneClick: false
+  artifactName: terminus-${version}-setup.${ext}
+  installerIcon: "./build/windows/icon.ico"
+portable:
+  artifactName: terminus-${version}-portable.exe
+
+mac:
+  category: public.app-category.video
+  icon: "./build/mac/icon.icns"
+  artifactName: terminus-${version}-macos.${ext}
+  hardenedRuntime: true
+  entitlements: "./build/mac/entitlements.plist"
+  entitlementsInherit: "./build/mac/entitlements.plist"
+  extendInfo:
+    NSRequiresAquaSystemAppearance: false
+pkg:
+  artifactName: terminus-${version}-macos.pkg
+
+linux:
+  category: Utilities
+  icon: "./build/icons"
+  artifactName: terminus-${version}-linux.${ext}
+  executableArgs:
+  - "--no-sandbox"
+snap:
+  plugs:
+  - default
+  - system-files
+  - system-observe
+deb:
+  depends:
+  - gconf2
+  - gconf-service
+  - libnotify4
+  - libsecret-1-0
+  - libappindicator1
+  - libxtst6
+  - libnss3
+  afterInstall: build/linux/after-install.tpl
+rpm:
+  depends:
+  - screen
+  - gnome-python2-gnomekeyring

package.json

@@ -1,34 +1,34 @@
 {
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.11.2",
+    "@fortawesome/fontawesome-free": "^5.12.0",
     "@sentry/cli": "^1.49.0",
     "@sentry/electron": "^1.0.0",
     "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
     "@types/js-yaml": "^3.12.1",
     "@types/node": "12.7.12",
-    "@types/webpack-env": "1.14.1",
+    "@types/webpack-env": "1.15.0",
     "@typescript-eslint/eslint-plugin": "^2.13.0",
-    "@typescript-eslint/parser": "^2.13.0",
+    "@typescript-eslint/parser": "^2.17.0",
     "apply-loader": "2.0.0",
     "awesome-typescript-loader": "^5.0.0",
-    "core-js": "^3.6.1",
+    "core-js": "^3.6.4",
     "cross-env": "6.0.3",
-    "css-loader": "3.4.0",
-    "electron": "^7.1.7",
-    "electron-builder": "22.1.0",
+    "css-loader": "3.4.2",
+    "electron": "^8.0.0",
+    "electron-builder": "22.3.2",
     "electron-download": "^4.1.1",
-    "electron-installer-snap": "^4.1.0",
+    "electron-installer-snap": "^5.0.0",
     "electron-notarize": "^0.1.1",
-    "electron-rebuild": "^1.8.5",
+    "electron-rebuild": "^1.9.0",
     "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-import": "^2.20.0",
     "file-loader": "^5.0.2",
     "graceful-fs": "^4.2.2",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
-    "node-abi": "^2.12.0",
-    "node-gyp": "^6.0.1",
+    "node-abi": "^2.14.0",
+    "node-gyp": "^6.1.0",
     "node-sass": "^4.13.0",
     "npmlog": "4.1.2",
     "npx": "^10.2.0",
@@ -42,89 +42,20 @@
     "shelljs": "0.8.3",
     "source-code-pro": "^2.30.2",
     "source-sans-pro": "3.6.0",
-    "style-loader": "^1.0.1",
+    "style-loader": "^1.1.2",
     "svg-inline-loader": "^0.8.0",
     "to-string-loader": "1.1.6",
     "tslib": "^1.10.0",
-    "typedoc": "^0.15.6",
-    "typescript": "^3.7.3",
+    "typedoc": "^0.16.7",
+    "typescript": "^3.7.4",
     "url-loader": "^3.0.0",
     "val-loader": "2.1.0",
-    "webpack": "^5.0.0-beta.11",
+    "webpack": "^5.0.0-beta.12",
     "webpack-cli": "^3.3.10",
     "yaml-loader": "0.5.0"
   },
   "resolutions": {
-    "*/node-abi": "^2.8.0"
-  },
-  "build": {
-    "appId": "org.terminus",
-    "productName": "Terminus",
-    "compression": "normal",
-    "afterSign": "./build/mac/afterSignHook.js",
-    "files": [
-      "**/*",
-      "dist"
-    ],
-    "extraResources": [
-      "builtin-plugins",
-      "extras"
-    ],
-    "win": {
-      "icon": "./build/windows/icon.ico",
-      "artifactName": "terminus-${version}-setup.exe",
-      "rfc3161TimeStampServer": "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
-    },
-    "nsis": {
-      "oneClick": false,
-      "artifactName": "terminus-${version}-setup.${ext}",
-      "installerIcon": "./build/windows/icon.ico"
-    },
-    "publish": [
-      {
-        "provider": "github"
-      }
-    ],
-    "portable": {
-      "artifactName": "terminus-${version}-portable.exe"
-    },
-    "mac": {
-      "category": "public.app-category.video",
-      "icon": "./build/mac/icon.icns",
-      "artifactName": "terminus-${version}-macos.${ext}",
-      "hardenedRuntime": true,
-      "entitlements": "./build/mac/entitlements.plist",
-      "entitlementsInherit": "./build/mac/entitlements.plist",
-      "extendInfo": {
-        "NSRequiresAquaSystemAppearance": false
-      }
-    },
-    "pkg": {
-      "artifactName": "terminus-${version}-macos.pkg"
-    },
-    "linux": {
-      "category": "Utilities",
-      "icon": "./build/icons",
-      "artifactName": "terminus-${version}-linux.${ext}"
-    },
-    "deb": {
-      "depends": [
-        "gconf2",
-        "gconf-service",
-        "libnotify4",
-        "libsecret-1-0",
-        "libappindicator1",
-        "libxtst6",
-        "libnss3"
-      ],
-      "afterInstall": "build/linux/after-install.tpl"
-    },
-    "rpm": {
-      "depends": [
-        "screen",
-        "gnome-python2-gnomekeyring"
-      ]
-    }
+    "*/node-abi": "^2.14.0"
   },
   "scripts": {
     "build": "npm run build:typings && 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-plugin-manager/webpack.config.js && webpack --color --config terminus-community-color-schemes/webpack.config.js && webpack --color --config terminus-ssh/webpack.config.js",
@@ -133,7 +64,7 @@
     "start": "cross-env TERMINUS_DEV=1 electron app --debug",
     "prod": "cross-env TERMINUS_DEV=1 electron app",
     "docs": "typedoc --out docs/api terminus-core/src && typedoc --out docs/api/terminal --tsconfig terminus-terminal/tsconfig.typings.json terminus-terminal/src && typedoc --out docs/api/settings --tsconfig terminus-settings/tsconfig.typings.json terminus-settings/src",
-    "lint": "eslint --ext ts */src",
+    "lint": "eslint --ext ts */src */lib",
     "postinstall": "node ./scripts/install-deps.js"
   },
   "repository": "eugeny/terminus"

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.99-nightly.0",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.99-nightly.0",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"

terminus-core/src/api/index.ts

@@ -1,4 +1,5 @@
 export { BaseTabComponent, BaseTabProcess } from '../components/baseTab.component'
+export { TabHeaderComponent } from '../components/tabHeader.component'
 export { SplitTabComponent, SplitContainer } from '../components/splitTab.component'
 export { TabRecoveryProvider, RecoveredTab } from './tabRecovery'
 export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
@@ -18,3 +19,4 @@ export { HostAppService, Platform } from '../services/hostApp.service'
 export { ShellIntegrationService } from '../services/shellIntegration.service'
 export { ThemesService } from '../services/themes.service'
 export { TabsService } from '../services/tabs.service'
+export * from '../utils'

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

@@ -38,7 +38,7 @@ title-bar(
                 button.btn.btn-secondary.btn-tab-bar(
                     [title]='button.title',
                     (click)='button.click && button.click()',
-                    [innerHTML]='sanitizeIcon(button.icon)',
+                    [fastHtmlBind]='button.icon',
                     ngbDropdownToggle,
                 )
                 div(*ngIf='button.submenu', ngbDropdownMenu)
@@ -49,7 +49,7 @@ title-bar(
                     )
                         .icon-wrapper(
                             *ngIf='hasIcons(button.submenuItems)',
-                            [innerHTML]='sanitizeIcon(item.icon)'
+                            [fastHtmlBind]='item.icon'
                         )
                         div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
@@ -64,7 +64,7 @@ title-bar(
                 button.btn.btn-secondary.btn-tab-bar(
                     [title]='button.title',
                     (click)='button.click && button.click()',
-                    [innerHTML]='sanitizeIcon(button.icon)',
+                    [fastHtmlBind]='button.icon',
                     ngbDropdownToggle,
                 )
                 div(*ngIf='button.submenu', ngbDropdownMenu)
@@ -75,7 +75,7 @@ title-bar(
                     )
                         .icon-wrapper(
                             *ngIf='hasIcons(button.submenuItems)',
-                            [innerHTML]='sanitizeIcon(item.icon)'
+                            [fastHtmlBind]='item.icon'
                         )
                         div([class.ml-3]='hasIcons(button.submenuItems)') {{item.title}}
 
@@ -83,7 +83,7 @@ title-bar(
                 *ngIf='updatesAvailable',
                 title='Update available - Click to install',
                 (click)='updateApp()',
-                [innerHTML]='sanitizeIcon(updateIcon)'
+                [fastHtmlBind]='updateIcon'
             )
 
         window-controls.background(

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

@@ -64,6 +64,7 @@ $tab-border-radius: 4px;
     &>.drag-space {
         min-width: 1px;
         flex: 1 0 1%;
+        margin-top: 2px; // for window resizing
         -webkit-app-region: drag;
 
         &.persistent {

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

@@ -1,6 +1,5 @@
 import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
-import { DomSanitizer } from '@angular/platform-browser'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { ElectronService } from '../services/electron.service'
@@ -75,7 +74,6 @@ export class AppRootComponent {
         public hostApp: HostAppService,
         public config: ConfigService,
         public app: AppService,
-        private domSanitizer: DomSanitizer,
         @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[],
         log: LogService,
         ngbModal: NgbModal,
@@ -109,6 +107,12 @@ export class AppRootComponent {
                 if (hotkey === 'previous-tab') {
                     this.app.previousTab()
                 }
+                if (hotkey === 'move-tab-left') {
+                    this.app.moveSelectedTabLeft()
+                }
+                if (hotkey === 'move-tab-right') {
+                    this.app.moveSelectedTabRight()
+                }
             }
             if (hotkey === 'toggle-fullscreen') {
                 this.hostApp.toggleFullscreen()
@@ -254,10 +258,6 @@ export class AppRootComponent {
         return submenuItems.some(x => !!x.icon)
     }
 
-    sanitizeIcon (icon: string): any {
-        return this.domSanitizer.bypassSecurityTrustHtml(icon || '')
-    }
-
     private getToolbarButtons (aboveZero: boolean): ToolbarButton[] {
         let buttons: ToolbarButton[] = []
         this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => {

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

@@ -3,3 +3,24 @@
     position: relative;
     flex: auto;
 }
+
+::ng-deep split-tab > .child {
+    position: absolute;
+    transition: 0.125s all;
+    opacity: .75;
+
+    &.focused {
+        opacity: 1;
+    }
+
+    &.minimized {
+        opacity: .1;
+    }
+
+    &.maximized {
+        z-index: 2;
+        box-shadow: rgba(0, 0, 0, 0.25) 0px 0px 30px;
+        backdrop-filter: blur(10px);
+        border-radius: 10px;
+    }
+}

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

@@ -141,6 +141,8 @@ export interface SplitSpannerInfo {
     styles: [require('./splitTab.component.scss')],
 })
 export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDestroy {
+    static DIRECTIONS: SplitDirection[] = ['t', 'r', 'b', 'l']
+
     /** @hidden */
     @ViewChild('vc', { read: ViewContainerRef }) viewContainer: ViewContainerRef
 
@@ -156,6 +158,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     _spanners: SplitSpannerInfo[] = []
 
     private focusedTab: BaseTabComponent
+    private maximizedTab: BaseTabComponent|null = null
     private hotkeysSubscription: Subscription
     private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
 
@@ -226,6 +229,13 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                 case 'pane-nav-down':
                     this.navigate('b')
                     break
+                case 'pane-maximize':
+                    if (this.maximizedTab) {
+                        this.maximize(null)
+                    } else if (this.getAllTabs().length > 1) {
+                        this.maximize(this.focusedTab)
+                    }
+                    break
                 case 'close-pane':
                     this.removeTab(this.focusedTab)
                     break
@@ -261,6 +271,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         return this.focusedTab
     }
 
+    getMaximizedTab (): BaseTabComponent|null {
+        return this.maximizedTab
+    }
+
     focus (tab: BaseTabComponent) {
         this.focusedTab = tab
         for (const x of this.getAllTabs()) {
@@ -272,6 +286,15 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
             tab.emitFocused()
             this.focusChanged.next(tab)
         }
+
+        if (this.maximizedTab !== tab) {
+            this.maximizedTab = null
+        }
+        this.layout()
+    }
+
+    maximize (tab: BaseTabComponent|null) {
+        this.maximizedTab = tab
         this.layout()
     }
 
@@ -436,6 +459,13 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         this.splitAdjusted.next(spanner)
     }
 
+    destroy () {
+        super.destroy()
+        for (const x of this.getAllTabs()) {
+            x.destroy()
+        }
+    }
+
     private attachTabView (tab: BaseTabComponent) {
         const ref = this.viewContainer.insert(tab.hostView) as EmbeddedViewRef<any> // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
         this.viewRefs.set(tab, ref)
@@ -486,13 +516,21 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                 this.layoutInternal(child, childX, childY, childW, childH)
             } else {
                 const element = this.viewRefs.get(child)!.rootNodes[0]
-                element.style.position = 'absolute'
+                element.classList.toggle('child', true)
+                element.classList.toggle('maximized', child === this.maximizedTab)
+                element.classList.toggle('minimized', this.maximizedTab && child !== this.maximizedTab)
+                element.classList.toggle('focused', child === this.focusedTab)
                 element.style.left = `${childX}%`
                 element.style.top = `${childY}%`
                 element.style.width = `${childW}%`
                 element.style.height = `${childH}%`
 
-                element.style.opacity = child === this.focusedTab ? 1 : 0.75
+                if (child === this.maximizedTab) {
+                    element.style.left = '5%'
+                    element.style.top = '5%'
+                    element.style.width = '90%'
+                    element.style.height = '90%'
+                }
             }
             offset += sizes[i]
 
@@ -526,6 +564,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                 }
             }
         }
+        while (root.ratios.length < root.children.length) {
+            root.ratios.push(1)
+        }
+        root.normalize()
     }
 }
 

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

@@ -16,13 +16,17 @@ export class SplitTabSpannerComponent {
     @HostBinding('class.v') isVertical = true
     @HostBinding('style.left') cssLeft: string
     @HostBinding('style.top') cssTop: string
-    @HostBinding('style.width') cssWidth: string
-    @HostBinding('style.height') cssHeight: string
+    @HostBinding('style.width') cssWidth: string | null
+    @HostBinding('style.height') cssHeight: string | null
     private marginOffset = -5
 
     constructor (private element: ElementRef) { }
 
     ngAfterViewInit () {
+        this.element.nativeElement.addEventListener('dblclick', () => {
+            this.reset()
+        })
+
         this.element.nativeElement.addEventListener('mousedown', (e: MouseEvent) => {
             this.isActive = true
             const start = this.isVertical ? e.pageY : e.pageX
@@ -49,14 +53,16 @@ export class SplitTabSpannerComponent {
                 diff = Math.max(diff, -this.container.ratios[this.index - 1] + 0.1)
                 diff = Math.min(diff, this.container.ratios[this.index] - 0.1)
 
-                this.container.ratios[this.index - 1] += diff
-                this.container.ratios[this.index] -= diff
-                this.change.emit()
+                if (diff) {
+                    this.container.ratios[this.index - 1] += diff
+                    this.container.ratios[this.index] -= diff
+                    this.change.emit()
+                }
             }
 
-            document.addEventListener('mouseup', offHandler)
+            document.addEventListener('mouseup', offHandler, { passive: true })
             this.element.nativeElement.parentElement.addEventListener('mousemove', dragHandler)
-        })
+        }, { passive: true })
     }
 
     ngOnChanges () {
@@ -79,10 +85,17 @@ export class SplitTabSpannerComponent {
         }
     }
 
+    reset () {
+        const ratio = (this.container.ratios[this.index - 1] + this.container.ratios[this.index]) / 2
+        this.container.ratios[this.index - 1] = ratio
+        this.container.ratios[this.index] = ratio
+        this.change.emit()
+    }
+
     private setDimensions (x: number, y: number, w: number, h: number) {
         this.cssLeft = `${x}%`
         this.cssTop = `${y}%`
-        this.cssWidth = w ? `${w}%` : 'initial'
-        this.cssHeight = h ? `${h}%` : 'initial'
+        this.cssWidth = w ? `${w}%` : null
+        this.cssHeight = h ? `${h}%` : null
     }
 }

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

@@ -20,7 +20,7 @@ $tabs-height: 38px;
         cursor: -webkit-grab;
 
         margin-left: 10px;
-        width: 20px;
+        width: 22px;
         border-radius: 10px;
         text-align: center;
         transition: 0.25s all;

terminus-core/src/configDefaults.linux.yaml

@@ -16,6 +16,10 @@ hotkeys:
   previous-tab:
     - 'Ctrl-Shift-Left'
     - 'Ctrl-Shift-Tab'
+  move-tab-left:
+    - 'Ctrl-Shift-PageUp'
+  move-tab-right:
+    - 'Ctrl-Shift-PageDown'
   tab-1:
     - 'Alt-1'
   tab-2:
@@ -50,5 +54,7 @@ hotkeys:
     - 'Ctrl-Alt-Up'
   pane-nav-left:
     - 'Ctrl-Alt-Left'
+  pane-maximize:
+    - 'Ctrl-Alt-Enter'
   close-pane: []
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.macos.yaml

@@ -14,6 +14,10 @@ hotkeys:
     - 'Ctrl-Tab'
   previous-tab:
     - 'Ctrl-Shift-Tab'
+  move-tab-left:
+    - '⌘-Shift-Left'
+  move-tab-right:
+    - '⌘-Shift-Right'
   tab-1:
     - '⌘-1'
   tab-2:
@@ -48,6 +52,8 @@ hotkeys:
     - '⌘-⌥-Up'
   pane-nav-left:
     - '⌘-⌥-Left'
+  pane-maximize:
+    - '⌘-⌥-Enter'
   close-pane:
     - '⌘-Shift-W'
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -5,6 +5,7 @@ hotkeys:
     - 'Ctrl+Space'
   toggle-fullscreen:
     - 'F11'
+    - 'Alt-Enter'
   close-tab:
     - 'Ctrl-Shift-W'
   toggle-last-tab: []
@@ -16,6 +17,10 @@ hotkeys:
   previous-tab:
     - 'Ctrl-Shift-Left'
     - 'Ctrl-Shift-Tab'
+  move-tab-left:
+    - 'Ctrl-Shift-PageUp'
+  move-tab-right:
+    - 'Ctrl-Shift-PageDown'
   tab-1:
     - 'Alt-1'
   tab-2:
@@ -50,5 +55,7 @@ hotkeys:
     - 'Ctrl-Alt-Up'
   pane-nav-left:
     - 'Ctrl-Alt-Left'
+  pane-maximize:
+    - 'Ctrl-Alt-Enter'
   close-pane: []
 pluginBlacklist: []

terminus-core/src/configDefaults.yaml

@@ -8,7 +8,7 @@ appearance:
   frame: thin
   css: '/* * { color: blue !important; } */'
   opacity: 1.0
-  vibrancy: false
+  vibrancy: true
   vibrancyType: 'blur'
 enableAnalytics: true
 enableWelcomeTab: true

terminus-core/src/directives/fastHtmlBind.directive.ts

@@ -0,0 +1,14 @@
+import { Directive, Input, ElementRef, OnChanges } from '@angular/core'
+
+/** @hidden */
+@Directive({
+    selector: '[fastHtmlBind]',
+})
+export class FastHtmlBindDirective implements OnChanges {
+    @Input() fastHtmlBind: string
+    constructor (private el: ElementRef) { }
+
+    ngOnChanges () {
+        this.el.nativeElement.innerHTML = this.fastHtmlBind || ''
+    }
+}

terminus-core/src/hotkeys.ts

@@ -37,6 +37,14 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'previous-tab',
             name: 'Previous tab',
         },
+        {
+            id: 'move-tab-left',
+            name: 'Move tab to the left',
+        },
+        {
+            id: 'move-tab-right',
+            name: 'Move tab to the right',
+        },
         {
             id: 'tab-1',
             name: 'Tab 1',
@@ -93,6 +101,10 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'split-top',
             name: 'Split to the top',
         },
+        {
+            id: 'pane-maximize',
+            name: 'Maximize the active pane',
+        },
         {
             id: 'pane-nav-up',
             name: 'Focus the pane above',

terminus-core/src/index.ts

@@ -21,6 +21,7 @@ import { SplitTabSpannerComponent } from './components/splitTabSpanner.component
 import { WelcomeTabComponent } from './components/welcomeTab.component'
 
 import { AutofocusDirective } from './directives/autofocus.directive'
+import { FastHtmlBindDirective } from './directives/fastHtmlBind.directive'
 
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { ConfigProvider } from './api/configProvider'
@@ -80,6 +81,7 @@ const PROVIDERS = [
         RenameTabModalComponent,
         SafeModeModalComponent,
         AutofocusDirective,
+        FastHtmlBindDirective,
         SplitTabComponent,
         SplitTabSpannerComponent,
         WelcomeTabComponent,

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

@@ -83,6 +83,10 @@ export class AppService {
                 this.startTabStorage()
             }
         }
+
+        hostApp.windowFocused$.subscribe(() => {
+            this._activeTab?.emitFocused()
+        })
     }
 
     startTabStorage () {
@@ -94,8 +98,13 @@ export class AppService {
         }, 30000)
     }
 
-    addTabRaw (tab: BaseTabComponent) {
-        this.tabs.push(tab)
+    addTabRaw (tab: BaseTabComponent, index: number|null = null) {
+        if (index !== null) {
+            this.tabs.splice(index, 0, tab)
+        } else {
+            this.tabs.push(tab)
+        }
+
         this.selectTab(tab)
         this.tabsChanged.next()
         this.tabOpened.next(tab)
@@ -121,6 +130,11 @@ export class AppService {
             this.tabsChanged.next()
             this.tabClosed.next(tab)
         })
+
+        if (tab instanceof SplitTabComponent) {
+            tab.tabAdded$.subscribe(() => this.emitTabsChanged())
+            tab.tabRemoved$.subscribe(() => this.emitTabsChanged())
+        }
     }
 
     /**
@@ -169,6 +183,17 @@ export class AppService {
         }
     }
 
+    getParentTab (tab: BaseTabComponent): SplitTabComponent|null {
+        for (const topLevelTab of this.tabs) {
+            if (topLevelTab instanceof SplitTabComponent) {
+                if (topLevelTab.getAllTabs().includes(tab)) {
+                    return topLevelTab
+                }
+            }
+        }
+        return null
+    }
+
     /** Switches between the current tab and the previously active one */
     toggleLastTab () {
         if (!this.lastTabIndex || this.lastTabIndex >= this.tabs.length) {
@@ -199,6 +224,35 @@ export class AppService {
         }
     }
 
+    moveSelectedTabLeft () {
+        if (this.tabs.length > 1) {
+            const tabIndex = this.tabs.indexOf(this._activeTab)
+            if (tabIndex > 0) {
+                this.swapTabs(this._activeTab, this.tabs[tabIndex - 1])
+            } else if (this.config.store.appearance.cycleTabs) {
+                this.swapTabs(this._activeTab, this.tabs[this.tabs.length - 1])
+            }
+        }
+    }
+
+    moveSelectedTabRight () {
+        if (this.tabs.length > 1) {
+            const tabIndex = this.tabs.indexOf(this._activeTab)
+            if (tabIndex < this.tabs.length - 1) {
+                this.swapTabs(this._activeTab, this.tabs[tabIndex + 1])
+            } else if (this.config.store.appearance.cycleTabs) {
+                this.swapTabs(this._activeTab, this.tabs[0])
+            }
+        }
+    }
+
+    swapTabs (a: BaseTabComponent, b: BaseTabComponent) {
+        const i1 = this.tabs.indexOf(a)
+        const i2 = this.tabs.indexOf(b)
+        this.tabs[i1] = b
+        this.tabs[i2] = a
+    }
+
     /** @hidden */
     emitTabsChanged () {
         this.tabsChanged.next()
@@ -217,7 +271,7 @@ export class AppService {
     async duplicateTab (tab: BaseTabComponent) {
         const dup = await this.tabsService.duplicate(tab)
         if (dup) {
-            this.addTabRaw(dup)
+            this.addTabRaw(dup, this.tabs.indexOf(tab) + 1)
         }
     }
 

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

@@ -125,7 +125,22 @@ export class ConfigService {
     }
 
     getDefaults () {
-        return this.defaults
+        const cleanup = o => {
+            if (o instanceof Array) {
+                return o.map(cleanup)
+            } else if (o instanceof Object) {
+                const r = {}
+                for (const k of Object.keys(o)) {
+                    if (k !== '__nonStructural') {
+                        r[k] = cleanup(o[k])
+                    }
+                }
+                return r
+            } else {
+                return o
+            }
+        }
+        return cleanup(this.defaults)
     }
 
     load (): void {

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

@@ -30,9 +30,14 @@ export class HomeBaseService {
         let body = `Version: ${this.appVersion}\n`
         body += `Platform: ${os.platform()} ${os.release()}\n`
         const label = {
+            aix: 'OS: IBM AIX',
+            android: 'OS: Android',
             darwin: 'OS: macOS',
-            windows: 'OS: Windows',
+            freebsd: 'OS: FreeBSD',
             linux: 'OS: Linux',
+            openbsd: 'OS: OpenBSD',
+            sunos: 'OS: Solaris',
+            win32: 'OS: Windows',
         }[os.platform()]
         const plugins = (window as any).installedPlugins.filter(x => !x.isBuiltin).map(x => x.name)
         body += `Plugins: ${plugins.join(', ') || 'none'}\n\n`

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

@@ -4,6 +4,7 @@ import { Observable, Subject } from 'rxjs'
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { Logger, LogService } from './log.service'
+import { isWindowsBuild, WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED, WIN_BUILD_FLUENT_BG_SUPPORTED } from '../utils'
 
 export enum Platform {
     Linux, macOS, Windows,
@@ -39,6 +40,7 @@ export class HostAppService {
     private configChangeBroadcast = new Subject<void>()
     private windowCloseRequest = new Subject<void>()
     private windowMoved = new Subject<void>()
+    private windowFocused = new Subject<void>()
     private displayMetricsChanged = new Subject<void>()
     private logger: Logger
     private windowId: number
@@ -85,6 +87,8 @@ export class HostAppService {
 
     get windowMoved$ (): Observable<void> { return this.windowMoved }
 
+    get windowFocused$ (): Observable<void> { return this.windowFocused }
+
     get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
 
     private constructor (
@@ -128,6 +132,10 @@ export class HostAppService {
             this.zone.run(() => this.windowMoved.next())
         })
 
+        electron.ipcRenderer.on('host:window-focused', () => {
+            this.zone.run(() => this.windowFocused.next())
+        })
+
         electron.ipcRenderer.on('host:display-metrics-changed', () => {
             this.zone.run(() => this.displayMetricsChanged.next())
         })
@@ -157,6 +165,14 @@ export class HostAppService {
         electron.ipcRenderer.on('host:config-change', () => this.zone.run(() => {
             this.configChangeBroadcast.next()
         }))
+
+
+        if (
+            isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED) &&
+            !isWindowsBuild(WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED)
+        ) {
+            electron.ipcRenderer.send('window-set-disable-vibrancy-while-dragging', true)
+        }
     }
 
     /**
@@ -212,14 +228,12 @@ export class HostAppService {
      *
      * @param type `null`, or `fluent` when supported (Windowd only)
      */
-    setVibrancy (enable: boolean, type: string) {
+    setVibrancy (enable: boolean, type: string|null) {
+        if (!isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)) {
+            type = null
+        }
         document.body.classList.toggle('vibrant', enable)
-        if (this.platform === Platform.macOS) {
-            this.getWindow().setVibrancy(enable ? 'dark' : null as any) // electron issue 20269
-        }
-        if (this.platform === Platform.Windows) {
-            this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
-        }
+        this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
     }
 
     setTitle (title: string) {

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

@@ -8,7 +8,7 @@ import { HostAppService, Platform } from './hostApp.service'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch (_) { }
 
 @Injectable({ providedIn: 'root' })
@@ -18,11 +18,18 @@ export class ShellIntegrationService {
     private automatorWorkflowsDestination: string
     private registryKeys = [
         {
-            path: 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here',
+            path: 'Software\\Classes\\Directory\\Background\\shell\\Terminus',
+            value: 'Open Terminus here',
             command: 'open "%V"',
         },
         {
-            path: 'Software\\Classes\\*\\shell\\Paste path into Terminus',
+            path: 'SOFTWARE\\Classes\\Directory\\shell\\Terminus',
+            value: 'Open Terminus here',
+            command: 'open "%V"',
+        },
+        {
+            path: 'Software\\Classes\\*\\shell\\Terminus',
+            value: 'Paste path into Terminus',
             command: 'paste "%V"',
         },
     ]
@@ -61,9 +68,17 @@ export class ShellIntegrationService {
             for (const registryKey of this.registryKeys) {
                 wnr.createRegistryKey(wnr.HK.CU, registryKey.path)
                 wnr.createRegistryKey(wnr.HK.CU, registryKey.path + '\\command')
+                wnr.setRegistryValue(wnr.HK.CU, registryKey.path, '', wnr.REG.SZ, registryKey.value)
                 wnr.setRegistryValue(wnr.HK.CU, registryKey.path, 'Icon', wnr.REG.SZ, exe)
                 wnr.setRegistryValue(wnr.HK.CU, registryKey.path + '\\command', '', wnr.REG.SZ, exe + ' ' + registryKey.command)
             }
+
+            if(wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here')) {
+                wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\Directory\\Background\\shell\\Open Terminus here')
+            }
+            if(wnr.getRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Terminus')) {
+                wnr.deleteRegistryKey(wnr.HK.CU, 'Software\\Classes\\*\\shell\\Paste path into Terminus')
+            }
         }
     }
 

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

@@ -21,7 +21,18 @@ export class TabRecoveryService {
         window.localStorage.tabsRecovery = JSON.stringify(
             await Promise.all(
                 tabs
-                    .map(tab => tab.getRecoveryToken())
+                    .map(tab => {
+                        let token = tab.getRecoveryToken()
+                        if (token) {
+                            token = token.then(r => {
+                                if (r) {
+                                    r.tabColor = tab.color
+                                }
+                                return r
+                            })
+                        }
+                        return token
+                    })
                     .filter(token => !!token)
             )
         )
@@ -31,7 +42,9 @@ export class TabRecoveryService {
         for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
             try {
                 const tab = await provider.recover(token)
-                if (tab) {
+                if (tab !== null) {
+                    tab.options = tab.options || {}
+                    tab.options.color = token.tabColor || null
                     return tab
                 }
             } catch (error) {

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

@@ -23,16 +23,22 @@ export class UpdaterService {
     constructor (
         log: LogService,
         private electron: ElectronService,
-        config: ConfigService,
+        private config: ConfigService,
     ) {
         this.logger = log.create('updater')
 
+        if (process.platform === 'linux') {
+            this.electronUpdaterAvailable = false
+            return
+        }
+
         this.autoUpdater = electron.remote.require('electron-updater').autoUpdater
 
         this.autoUpdater.autoInstallOnAppQuit = !!config.store.enableAutomaticUpdates
 
         this.autoUpdater.on('update-available', () => {
             this.logger.info('Update available')
+            this.autoUpdater.downloadUpdate()
         })
         this.autoUpdater.once('update-not-available', () => {
             this.logger.info('No updates')
@@ -42,9 +48,8 @@ export class UpdaterService {
             this.autoUpdater.once('update-downloaded', () => resolve(true))
         })
 
-        this.logger.debug('Checking for updates')
-
-        if (this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) {
+        if (config.store.enableAutomaticUpdates && this.electronUpdaterAvailable && !process.env.TERMINUS_DEV) {
+            this.logger.debug('Checking for updates')
             try {
                 this.autoUpdater.checkForUpdates()
             } catch (e) {
@@ -55,6 +60,9 @@ export class UpdaterService {
     }
 
     async check (): Promise<boolean> {
+        if (!this.config.store.enableAutomaticUpdates) {
+            return false
+        }
         if (!this.electronUpdaterAvailable) {
             this.logger.debug('Checking for updates through fallback method.')
             const response = await axios.get(UPDATES_URL)

terminus-core/src/tabContextMenu.ts

@@ -1,4 +1,5 @@
 import { Injectable, NgZone } from '@angular/core'
+import { Subscription } from 'rxjs'
 import { AppService } from './services/app.service'
 import { BaseTabComponent } from './components/baseTab.component'
 import { TabHeaderComponent } from './components/tabHeader.component'
@@ -16,39 +17,49 @@ export class CloseContextMenu extends TabContextMenuItemProvider {
         super()
     }
 
-    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        return [
+    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        let items = [
             {
                 label: 'Close',
                 click: () => this.zone.run(() => {
-                    this.app.closeTab(tab, true)
-                }),
-            },
-            {
-                label: 'Close other tabs',
-                click: () => this.zone.run(() => {
-                    for (const 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 (const 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 (const t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
-                        this.app.closeTab(t, true)
+                    if (this.app.tabs.includes(tab)) {
+                        this.app.closeTab(tab, true)
+                    } else {
+                        tab.destroy()
                     }
                 }),
             },
         ]
+        if (tabHeader) {
+            items = [
+                ...items,
+                {
+                    label: 'Close other tabs',
+                    click: () => this.zone.run(() => {
+                        for (const 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 (const 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 (const t of this.app.tabs.slice(0, this.app.tabs.indexOf(tab))) {
+                            this.app.closeTab(t, true)
+                        }
+                    }),
+                },
+            ]
+        }
+        return items
     }
 }
 
@@ -75,28 +86,31 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
     }
 
     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[],
-            },
-        ]
+        if (tabHeader) {
+            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[],
+                },
+            ]
+        }
+        return []
     }
 }
 
@@ -112,36 +126,61 @@ export class TaskCompletionContextMenu extends TabContextMenuItemProvider {
 
     async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
         const 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
+        let items: Electron.MenuItemConstructorOptions[] = []
 
-                        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
+        const extTab: (BaseTabComponent & { __completionNotificationEnabled?: boolean, __outputNotificationSubscription?: Subscription|null }) = tab
+
+        if (process) {
+            items.push({
+                id: 'process-name',
+                enabled: false,
+                label: 'Current process: ' + process.name,
+            })
+            items.push({
+                label: 'Notify when done',
+                type: 'checkbox',
+                checked: extTab.__completionNotificationEnabled,
+                click: () => this.zone.run(() => {
+                    extTab.__completionNotificationEnabled = !extTab.__completionNotificationEnabled
+
+                    if (extTab.__completionNotificationEnabled) {
+                        this.app.observeTabCompletion(tab).subscribe(() => {
+                            new Notification('Process completed', {
+                                body: process.name,
+                            }).addEventListener('click', () => {
+                                this.app.selectTab(tab)
                             })
-                        } else {
-                            this.app.stopObservingTabCompletion(tab)
-                        }
-                    }),
-                },
-            ]
+                            extTab.__completionNotificationEnabled = false
+                        })
+                    } else {
+                        this.app.stopObservingTabCompletion(tab)
+                    }
+                }),
+            })
         }
-        return []
+        items.push({
+            label: 'Notify on activity',
+            type: 'checkbox',
+            checked: !!extTab.__outputNotificationSubscription,
+            click: () => this.zone.run(() => {
+                if (extTab.__outputNotificationSubscription) {
+                    extTab.__outputNotificationSubscription.unsubscribe()
+                    extTab.__outputNotificationSubscription = null
+                } else {
+                    extTab.__outputNotificationSubscription = tab.activity$.subscribe(active => {
+                        if (extTab.__outputNotificationSubscription && active) {
+                            extTab.__outputNotificationSubscription.unsubscribe()
+                            extTab.__outputNotificationSubscription = null
+                            new Notification('Tab activity', {
+                                body: tab.title,
+                            }).addEventListener('click', () => {
+                                this.app.selectTab(tab)
+                            })
+                        }
+                    })
+                }
+            }),
+        })
+        return items
     }
 }

terminus-core/src/theme.compact.scss

@@ -16,4 +16,8 @@ app-root {
     terminaltab .content {
         margin: 5px !important;
     }
+
+    ssh-tab .content {
+        margin: 5px !important;
+    }
 }

terminus-core/src/theme.vars.scss

@@ -142,7 +142,7 @@ $nav-tabs-link-active-border-color: #eee;
 $navbar-padding-y: 0;
 $navbar-padding-x: 0;
 
-$dropdown-bg: $table-bg;
+$dropdown-bg: $content-bg-solid;
 $dropdown-color: $body-color;
 $dropdown-border-width: 1px;
 $dropdown-box-shadow: 0 .5rem 1rem rgba($black,.175);

terminus-core/src/utils.ts

@@ -3,6 +3,8 @@ import * as os from 'os'
 export const WIN_BUILD_CONPTY_SUPPORTED = 17692
 export const WIN_BUILD_CONPTY_STABLE = 18309
 export const WIN_BUILD_WSL_EXE_DISTRO_FLAG = 17763
+export const WIN_BUILD_FLUENT_BG_SUPPORTED = 17063
+export const WIN_BUILD_FLUENT_BG_MOVE_BUG_FIXED = 18917
 
 export function isWindowsBuild (build: number): boolean {
     return process.platform === 'win32' && parseFloat(os.release()) >= 10 && parseInt(os.release().split('.')[2]) >= build

terminus-core/yarn.lock

@@ -46,17 +46,16 @@ async@^2.6.1:
     lodash "^4.17.11"
 
 axios@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
-  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.1.tgz#8a6a04eed23dfe72747e1dd43c604b8f1677b5aa"
+  integrity sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==
   dependencies:
     follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
 
 bootstrap@^4.1.3:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
-  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01"
+  integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==
 
 builder-util-runtime@8.4.0:
   version "8.4.0"
@@ -118,9 +117,9 @@ colorspace@1.1.x:
     text-hex "1.0.x"
 
 core-js@^3.1.2:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.1.tgz#39d5e2e346258cc01eb7d44345b1c3c014ca3f05"
-  integrity sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
+  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
 
 core-util-is@~1.0.0:
   version "1.0.2"
@@ -254,11 +253,6 @@ is-arrayish@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
-is-buffer@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -466,9 +460,9 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 uuid@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 winston-transport@^4.3.0:
   version "4.3.0"

terminus-plugin-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-plugin-manager",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.99-nightly.0",
   "description": "Terminus' plugin manager",
   "keywords": [
     "terminus-builtin-plugin"

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

@@ -8,6 +8,10 @@ const NAME_PREFIX = 'terminus-'
 const KEYWORD = 'terminus-plugin'
 const OFFICIAL_NPM_ACCOUNT = 'eugenepankov'
 
+const BLACKLIST = [
+    'terminus-shell-selector', // superseded by profiles
+]
+
 export interface PluginInfo {
     name: string
     description: string
@@ -75,6 +79,7 @@ export class PluginManagerService {
                 isOfficial: item.package.publisher.username === OFFICIAL_NPM_ACCOUNT,
             }))),
             map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX))),
+            map(plugins => plugins.filter(x => !BLACKLIST.includes(x.packageName))),
         )
     }
 

terminus-plugin-manager/yarn.lock

@@ -13,12 +13,11 @@ any-promise@^1.0.0:
   integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
 
 axios@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
-  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.1.tgz#8a6a04eed23dfe72747e1dd43c604b8f1677b5aa"
+  integrity sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==
   dependencies:
     follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
 
 debug@=3.1.0:
   version "3.1.0"
@@ -34,11 +33,6 @@ follow-redirects@1.5.10:
   dependencies:
     debug "=3.1.0"
 
-is-buffer@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

terminus-settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-settings",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.99-nightly.0",
   "description": "Terminus terminal settings page",
   "keywords": [
     "terminus-builtin-plugin"

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

@@ -1,5 +1,4 @@
 import * as yaml from 'js-yaml'
-import * as os from 'os'
 import { Subscription } from 'rxjs'
 import { Component, Inject, Input, HostBinding, NgZone } from '@angular/core'
 import {
@@ -14,6 +13,8 @@ import {
     Platform,
     HomeBaseService,
     ShellIntegrationService,
+    isWindowsBuild,
+    WIN_BUILD_FLUENT_BG_SUPPORTED,
 } from 'terminus-core'
 
 import { SettingsTabProvider } from '../api'
@@ -81,9 +82,7 @@ export class SettingsTabComponent extends BaseTabComponent {
             this.hotkeyDescriptions = descriptions
         })
 
-        this.isFluentVibrancySupported = hostApp.platform === Platform.Windows
-            && parseFloat(os.release()) >= 10
-            && parseInt(os.release().split('.')[2]) >= 17063
+        this.isFluentVibrancySupported = isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)
     }
 
     async ngOnInit () {
@@ -99,10 +98,6 @@ export class SettingsTabComponent extends BaseTabComponent {
         this.isShellIntegrationInstalled = await this.shellIntegration.isInstalled()
     }
 
-    async getRecoveryToken (): Promise<any> {
-        return null
-    }
-
     ngOnDestroy () {
         this.configSubscription.unsubscribe()
         this.config.save()

terminus-settings/src/index.ts

@@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 
-import TerminusCorePlugin, { ToolbarButtonProvider, TabRecoveryProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
+import TerminusCorePlugin, { ToolbarButtonProvider, HotkeyProvider, ConfigProvider } from 'terminus-core'
 
 import { HotkeyInputModalComponent } from './components/hotkeyInputModal.component'
 import { MultiHotkeyInputComponent } from './components/multiHotkeyInput.component'
@@ -11,7 +11,6 @@ import { SettingsTabComponent } from './components/settingsTab.component'
 import { SettingsTabBodyComponent } from './components/settingsTabBody.component'
 
 import { ButtonProvider } from './buttonProvider'
-import { RecoveryProvider } from './recoveryProvider'
 import { SettingsHotkeyProvider } from './hotkeys'
 import { SettingsConfigProvider } from './config'
 
@@ -25,7 +24,6 @@ import { SettingsConfigProvider } from './config'
     ],
     providers: [
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },
-        { provide: TabRecoveryProvider, useClass: RecoveryProvider, multi: true },
         { provide: ConfigProvider, useClass: SettingsConfigProvider, multi: true },
         { provide: HotkeyProvider, useClass: SettingsHotkeyProvider, multi: true },
     ],

terminus-settings/src/recoveryProvider.ts

@@ -1,15 +0,0 @@
-import { Injectable } from '@angular/core'
-import { TabRecoveryProvider, RecoveredTab } from 'terminus-core'
-
-import { SettingsTabComponent } from './components/settingsTab.component'
-
-/** @hidden */
-@Injectable()
-export class RecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
-        if (recoveryToken && recoveryToken.type === 'app:settings') {
-            return { type: SettingsTabComponent }
-        }
-        return null
-    }
-}

terminus-ssh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-ssh",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.99-nightly.0",
   "description": "SSH connection manager for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -21,6 +21,7 @@
     "@types/ssh2": "^0.5.35",
     "ssh2": "^0.8.2",
     "ssh2-streams": "^0.4.2",
+    "sshpk": "^1.16.1",
     "terminus-terminal": "^1.0.98-nightly.0"
   },
   "peerDependencies": {

terminus-ssh/src/api.ts

@@ -30,6 +30,8 @@ export interface SSHConnection {
     keepaliveInterval?: number
     keepaliveCountMax?: number
     readyTimeout?: number
+    color?: string
+    x11?: boolean
 
     algorithms?: {[t: string]: string[]}
 }
@@ -88,16 +90,7 @@ export class SSHSession extends BaseSession {
         this.open = true
 
         try {
-            try {
-                this.shell = await this.openShellChannel({ x11: true })
-            } catch (e) {
-                if (e.toString().includes('Unable to request X11')) {
-                    this.logger.debug('X11 forwarding rejected, trying without')
-                    this.shell = await this.openShellChannel({})
-                } else {
-                    throw e
-                }
-            }
+            this.shell = await this.openShellChannel({ x11: this.connection.x11 })
         } catch (err) {
             this.emitServiceMessage(`Remote rejected opening a shell channel: ${err}`)
         }
@@ -112,7 +105,7 @@ export class SSHSession extends BaseSession {
 
         this.shell.on('data', data => {
             const dataString = data.toString()
-            this.emitOutput(dataString)
+            this.emitOutput(data)
 
             if (this.scripts) {
                 let found = false

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

@@ -70,49 +70,78 @@
         ngb-tab(id='advanced')
             ng-template(ngbTabTitle) Advanced
             ng-template(ngbTabContent)
-                .form-group
-                    label Keep Alive Interval (Milliseconds)
+                .form-line
+                    .header
+                        .title X11 forwarding
+                    toggle([(ngModel)]='connection.x11')
+
+                .form-line
+                    .header
+                        .title Tab color
+                    input.form-control(
+                        type='text',
+                        autofocus,
+                        [(ngModel)]='connection.color',
+                        placeholder='#000000'
+                    )
+
+                .form-line
+                    .header
+                        .title Keep Alive Interval (Milliseconds)
                     input.form-control(
                         type='number',
                         placeholder='0',
                         [(ngModel)]='connection.keepaliveInterval',
                     )
 
-                .form-group
-                    label Max Keep Alive Count
+                .form-line
+                    .header
+                        .title Max Keep Alive Count
                     input.form-control(
                         type='number',
                         placeholder='3',
                         [(ngModel)]='connection.keepaliveCountMax',
                     )
 
-                .form-group
-                    label Ready Timeout (Milliseconds)
+                .form-line
+                    .header
+                        .title Ready Timeout (Milliseconds)
                     input.form-control(
                         type='number',
                         placeholder='20000',
                         [(ngModel)]='connection.readyTimeout',
                     )
 
-                .form-group
-                    label Ciphers
-                    div(*ngFor='let alg of supportedAlgorithms.cipher')
-                        checkbox([text]='alg', [(ngModel)]='algorithms.cipher[alg]')
+        ngb-tab(id='ciphers')
+            ng-template(ngbTabTitle) Ciphers
+            ng-template(ngbTabContent)
+                .form-line.align-items-start
+                    .header
+                        .title Ciphers
+                    .w-50
+                        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-line.align-items-start
+                    .header
+                        .title Key exchange
+                    .w-50
+                        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-line.align-items-start
+                    .header
+                        .title HMAC
+                    .w-50
+                        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]')
+                .form-line.align-items-start
+                    .header
+                        .title Host key
+                    .w-50
+                        div(*ngFor='let alg of supportedAlgorithms.serverHostKey')
+                            checkbox([text]='alg', [(ngModel)]='algorithms.serverHostKey[alg]')
 
 
         ngb-tab(id='scripts')

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

@@ -1,6 +1,7 @@
 import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { ConfigService, ElectronService, HostAppService } from 'terminus-core'
+import { PasswordStorageService } from '../services/passwordStorage.service'
 import { SSHConnection, SSHConnectionGroup } from '../api'
 import { EditConnectionModalComponent } from './editConnectionModal.component'
 import { PromptModalComponent } from './promptModal.component'
@@ -19,6 +20,7 @@ export class SSHSettingsTabComponent {
         private electron: ElectronService,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
+        private passwordStorage: PasswordStorageService,
     ) {
         this.connections = this.config.store.ssh.connections
         this.refresh()
@@ -65,6 +67,7 @@ export class SSHSettingsTabComponent {
             }
         )).response === 1) {
             this.connections = this.connections.filter(x => x !== connection)
+            this.passwordStorage.deletePassword(connection)
             this.config.store.ssh.connections = this.connections
             this.config.save()
             this.refresh()

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

@@ -1,3 +1,15 @@
-button.btn.btn-outline-secondary((click)='showPortForwarding()')
-    i.fas.fa-plug
-    span Ports
+.ssh-tab-toolbar
+    .btn.btn-outline-secondary.reveal-button
+        i.fas.fa-ellipsis-h
+    .toolbar(*ngIf='session', [class.show]='!session.open')
+        i.fas.fa-circle.text-success.mr-2(*ngIf='session.open')
+        i.fas.fa-circle.text-danger.mr-2(*ngIf='!session.open')
+        strong.mr-auto(*ngIf='session') {{session.connection.user}}@{{session.connection.host}}:{{session.connection.port}}
+
+        button.btn.btn-secondary((click)='showPortForwarding()', *ngIf='session.open')
+            i.fas.fa-plug
+            span Ports
+
+        button.btn.btn-info((click)='reconnect()', *ngIf='!session.open')
+            i.fas.fa-reload
+            span Reconnect

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

@@ -13,10 +13,59 @@
         margin: 15px;
     }
 
-    &> button {
+    .ssh-tab-toolbar {
         position: absolute;
-        bottom: 20px;
-        right: 40px;
+        top: 0;
+        left: 0;
+        right: 0;
         z-index: 4;
+        pointer-events: none;
+
+        .reveal-button {
+            position: absolute;
+            top: 10px;
+            right: 30px;
+            border-radius: 50%;
+            width: 35px;
+            padding: 0;
+            height: 35px;
+            line-height: 35px;
+            transition: 0.125s opacity;
+            opacity: .5;
+            pointer-events: all;
+        }
+
+        &:hover .reveal-button {
+            opacity: 0;
+        }
+
+        &:hover .toolbar {
+            opacity: 1;
+        }
+
+        .toolbar {
+            opacity: 0;
+            background: rgba(0, 0, 0, .75);
+            padding: 10px 20px;
+            transition: 0.25s opacity;
+            display: flex;
+            align-items: center;
+            z-index: 1;
+            will-change: transform;
+
+            &>* {
+                pointer-events: all;
+            }
+        }
+
+        &.show {
+            .reveal-button {
+                opacity: 0;
+            }
+
+            .toolbar {
+                opacity: 1;
+            }
+        }
     }
 }

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

@@ -8,6 +8,7 @@ import { SSHPortForwardingModalComponent } from './sshPortForwardingModal.compon
 
 /** @hidden */
 @Component({
+    selector: 'ssh-tab',
     template: BaseTerminalTabComponent.template + require<string>('./sshTab.component.pug'),
     styles: [require('./sshTab.component.scss'), ...BaseTerminalTabComponent.styles],
     animations: BaseTerminalTabComponent.animations,
@@ -68,6 +69,7 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         return {
             type: 'app:ssh-tab',
             connection: this.connection,
+            savedState: this.frontend?.saveState(),
         }
     }
 
@@ -75,4 +77,8 @@ export class SSHTabComponent extends BaseTerminalTabComponent {
         const modal = this.ngbModal.open(SSHPortForwardingModalComponent).componentInstance as SSHPortForwardingModalComponent
         modal.session = this.session
     }
+
+    reconnect () {
+        this.initializeSession()
+    }
 }

terminus-ssh/src/recoveryProvider.ts

@@ -10,7 +10,10 @@ export class RecoveryProvider extends TabRecoveryProvider {
         if (recoveryToken && recoveryToken.type === 'app:ssh-tab') {
             return {
                 type: SSHTabComponent,
-                options: { connection: recoveryToken.connection },
+                options: {
+                    connection: recoveryToken.connection,
+                    savedState: recoveryToken.savedState,
+                },
             }
         }
         return null

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

@@ -3,6 +3,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { Client } from 'ssh2'
 import * as fs from 'mz/fs'
 import * as path from 'path'
+import * as sshpk from 'sshpk'
 import { ToastrService } from 'ngx-toastr'
 import { AppService, HostAppService, Platform, Logger, LogService } from 'terminus-core'
 import { SSHConnection, SSHSession } from '../api'
@@ -12,7 +13,7 @@ import { PasswordStorageService } from './passwordStorage.service'
 import { SSH2Stream } from 'ssh2-streams'
 
 try {
-    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTreeNative = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 @Injectable({ providedIn: 'root' })
@@ -32,10 +33,14 @@ export class SSHService {
     }
 
     async openTab (connection: SSHConnection): Promise<SSHTabComponent> {
-        return this.zone.run(() => this.app.openNewTab(
+        const tab = this.zone.run(() => this.app.openNewTab(
             SSHTabComponent,
             { connection }
         ) as SSHTabComponent)
+        if (connection.color) {
+            (this.app.getParentTab(tab) || tab).color = connection.color
+        }
+        return tab
     }
 
     createSession (connection: SSHConnection): SSHSession {
@@ -46,7 +51,6 @@ export class SSHService {
 
     async connectSession (session: SSHSession, logCallback?: (s: any) => void): Promise<void> {
         let privateKey: string|null = null
-        let privateKeyPassphrase: string|null = null
         let privateKeyPath = session.connection.privateKey
 
         if (!logCallback) {
@@ -67,6 +71,7 @@ export class SSHService {
         }
 
         if (privateKeyPath) {
+            log(`Loading private key from ${privateKeyPath}`)
             try {
                 privateKey = (await fs.readFile(privateKeyPath)).toString()
             } catch (error) {
@@ -75,24 +80,31 @@ export class SSHService {
             }
 
             if (privateKey) {
-                log(`Loading private key from ${privateKeyPath}`)
+                let parsedKey: any = null
+                try {
+                    parsedKey = sshpk.parsePrivateKey(privateKey, 'auto')
+                } catch (e) {
+                    if (e instanceof sshpk.KeyEncryptedError) {
+                        const modal = this.ngbModal.open(PromptModalComponent)
+                        log('Key requires passphrase')
+                        modal.componentInstance.prompt = 'Private key passphrase'
+                        modal.componentInstance.password = true
+                        let passphrase = ''
+                        try {
+                            const result  = await modal.result
+                            passphrase = result?.value
+                        } catch (e) { }
+                        parsedKey = sshpk.parsePrivateKey(
+                            privateKey,
+                            'auto',
+                            { passphrase: passphrase }
+                        )
+                    } else {
+                        throw e
+                    }
+                }
 
-                let encrypted = privateKey.includes('ENCRYPTED')
-                if (privateKeyPath.toLowerCase().endsWith('.ppk')) {
-                    encrypted = encrypted || privateKey.includes('Encryption:') && !privateKey.includes('Encryption: none')
-                }
-                if (encrypted) {
-                    const modal = this.ngbModal.open(PromptModalComponent)
-                    log('Key requires passphrase')
-                    modal.componentInstance.prompt = 'Private key passphrase'
-                    modal.componentInstance.password = true
-                    try {
-                        const result  = await modal.result
-                        if (result) {
-                            privateKeyPassphrase = result.value
-                        }
-                    } catch (e) { }
-                }
+                privateKey = parsedKey!.toString('ssh')
             }
         }
 
@@ -163,7 +175,6 @@ export class SSHService {
                     username: session.connection.user,
                     password: session.connection.privateKey ? undefined : '',
                     privateKey: privateKey || undefined,
-                    passphrase: privateKeyPassphrase || undefined,
                     tryKeyboard: true,
                     agent: agent || undefined,
                     agentForward: !!agent,

terminus-ssh/yarn.lock

@@ -27,21 +27,53 @@
     "@types/node" "*"
     "@types/ssh2-streams" "*"
 
-asn1@~0.2.0:
+asn1@~0.2.0, asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
   integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
-bcrypt-pbkdf@^1.0.2:
+assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
   integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
-safer-buffer@~2.1.0:
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -62,6 +94,21 @@ ssh2@^0.8.2:
   dependencies:
     ssh2-streams "~0.4.8"
 
+sshpk@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
 streamsearch@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
@@ -72,7 +119,7 @@ terminus-terminal@^1.0.98-nightly.0:
   resolved "https://registry.yarnpkg.com/terminus-terminal/-/terminus-terminal-1.0.98-nightly.0.tgz#10df71b0a81adf76a076fb21a91c859dd2f8bef7"
   integrity sha512-JLxkeoQkORcfe6cRW6BJF5ZPSbvKA8IWUAb7fzBONVmNfRKj2Mq/uYPy76UXsdmb9F1n+rYIg+DShNp57asMKA==
 
-tweetnacl@^0.14.3:
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=

terminus-terminal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-terminal",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.99-nightly.0",
   "description": "Terminus' terminal emulation core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -19,6 +19,7 @@
   "devDependencies": {
     "@types/deep-equal": "^1.0.0",
     "@types/slug": "^0.9.1",
+    "ansi-colors": "^4.1.1",
     "dataurl": "0.1.0",
     "deep-equal": "1.1.0",
     "hterm-umdjs": "1.4.1",
@@ -27,11 +28,14 @@
     "runes": "^0.4.2",
     "slug": "^2.0.0",
     "uuid": "^3.3.2",
-    "xterm": "4.3.0",
+    "xterm": "^4.4.0-beta.15",
     "xterm-addon-fit": "^0.4.0-beta2",
     "xterm-addon-ligatures": "^0.2.1",
     "xterm-addon-search": "^0.4.0",
-    "xterm-addon-webgl": "^0.4.0"
+    "xterm-addon-serialize": "^0.1.1",
+    "xterm-addon-unicode11": "^0.1.1",
+    "xterm-addon-webgl": "^0.5.0-beta.7",
+    "zmodem.js": "^0.1.9"
   },
   "peerDependencies": {
     "@angular/animations": "^7",

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

@@ -1,9 +1,10 @@
 import { Observable, Subject, Subscription } from 'rxjs'
 import { first } from 'rxjs/operators'
 import { ToastrService } from 'ngx-toastr'
+import colors from 'ansi-colors'
 import { NgZone, OnInit, OnDestroy, Inject, Injector, Optional, ViewChild, HostBinding, Input, ElementRef } from '@angular/core'
 import { trigger, transition, style, animate, AnimationTriggerMetadata } from '@angular/animations'
-import { AppService, ConfigService, BaseTabComponent, ElectronService, HostAppService, HotkeysService, Platform, LogService, Logger } from 'terminus-core'
+import { AppService, ConfigService, BaseTabComponent, ElectronService, HostAppService, HotkeysService, Platform, LogService, Logger, TabContextMenuItemProvider } from 'terminus-core'
 
 import { BaseSession, SessionsService } from '../services/sessions.service'
 import { TerminalFrontendService } from '../services/terminalFrontend.service'
@@ -11,7 +12,6 @@ import { TerminalFrontendService } from '../services/terminalFrontend.service'
 import { Frontend } from '../frontends/frontend'
 import { ResizeEvent } from './interfaces'
 import { TerminalDecorator } from './decorator'
-import { TerminalContextMenuItemProvider } from './contextMenuProvider'
 
 
 /** @hidden */
@@ -35,6 +35,8 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     ])]
 
     session: BaseSession
+    savedState: any
+
     @Input() zoom = 0
 
     @Input() showSearchPanel = false
@@ -56,6 +58,11 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     frontendReady = new Subject<void>()
     size: ResizeEvent
 
+    /**
+     * Enables normall passthrough from session output to terminal input
+     */
+    enablePassthrough = true
+
     protected logger: Logger
     protected output = new Subject<string>()
     private sessionCloseSubscription: Subscription
@@ -83,7 +90,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
         @Inject(ToastrService) protected toastr: ToastrServiceProxy,
         protected log: LogService,
         @Optional() @Inject(TerminalDecorator) protected decorators: TerminalDecorator[],
-        @Optional() @Inject(TerminalContextMenuItemProvider) protected contextMenuProviders: TerminalContextMenuItemProvider[],
+        @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[],
     ) {
         super()
         this.logger = log.create('baseTerminalTab')
@@ -174,6 +181,13 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
             this.session.releaseInitialDataBuffer()
         })
 
+        if (this.savedState) {
+            this.frontend.restoreState(this.savedState)
+            this.frontend.write('\r\n\r\n')
+            this.frontend.write(colors.bgWhite.black(' * ') + colors.bgBlackBright.white(' History restored '))
+            this.frontend.write('\r\n\r\n')
+        }
+
         setImmediate(() => {
             if (this.hasFocus) {
                 this.frontend.attach(this.content.nativeElement)
@@ -248,7 +262,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
             const percentage = percentageMatch[3] ? parseFloat(percentageMatch[2]) : parseInt(percentageMatch[2])
             if (percentage > 0 && percentage <= 100) {
                 this.setProgress(percentage)
-                this.logger.debug('Detected progress:', percentage)
+                // this.logger.debug('Detected progress:', percentage)
             }
         } else {
             this.setProgress(null)
@@ -410,10 +424,12 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     protected attachSessionHandlers () {
         // this.session.output$.bufferTime(10).subscribe((datas) => {
         this.session.output$.subscribe(data => {
-            this.zone.run(() => {
-                this.output.next(data)
-                this.write(data)
-            })
+            if (this.enablePassthrough) {
+                this.zone.run(() => {
+                    this.output.next(data)
+                    this.write(data)
+                })
+            }
         })
 
         this.sessionCloseSubscription = this.session.closed$.subscribe(() => {

terminus-terminal/src/api/contextMenuProvider.ts

@@ -2,6 +2,7 @@ import { BaseTerminalTabComponent } from './baseTerminalTab.component'
 
 /**
  * Extend to add more terminal context menu items
+ * @deprecated
  */
 export abstract class TerminalContextMenuItemProvider {
     weight: number

terminus-terminal/src/api/interfaces.ts

@@ -16,8 +16,9 @@ export interface SessionOptions {
 }
 
 export interface Profile {
-    name: string,
-    sessionOptions: SessionOptions,
+    name: string
+    color?: string
+    sessionOptions: SessionOptions
     isBuiltin?: boolean
     icon?: string
 }

terminus-terminal/src/bufferizedPTY.js

@@ -8,7 +8,7 @@ module.exports = function patchPTYModule (mod) {
   mod.spawn = (file, args, opt) => {
     let terminal = oldSpawn(file, args, opt)
     let timeout = null
-    let buffer = ''
+    let buffer = Buffer.from('')
     let lastFlush = 0
     let nextTimeout = 0
 
@@ -19,11 +19,11 @@ module.exports = function patchPTYModule (mod) {
     const maxWindow = 100
 
     function flush () {
-        if (buffer) {
+        if (buffer.length) {
             terminal.emit('data-buffered', buffer)
         }
         lastFlush = Date.now()
-        buffer = ''
+        buffer = Buffer.from('')
     }
 
     function reschedule () {
@@ -38,12 +38,15 @@ module.exports = function patchPTYModule (mod) {
     }
 
     terminal.on('data', data => {
-        buffer += data
+        if (typeof data === 'string') {
+            data = Buffer.from(data)
+        }
+        buffer = Buffer.concat([buffer, data])
         if (Date.now() - lastFlush > maxWindow) {
             // Taking too much time buffering, flush to keep things interactive
             flush()
         } else {
-            if (Date.now() > nextTimeout - (maxWindow / 10)) {
+            if (Date.now() > nextTimeout - maxWindow / 10) {
                 // Extend the window if it's expiring
                 reschedule()
             }

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

@@ -5,10 +5,9 @@ import deepEqual from 'deep-equal'
 const fontManager = require('fontmanager-redux') // eslint-disable-line
 
 import { Component, Inject } from '@angular/core'
-import { ConfigService, HostAppService, Platform, ElectronService } from 'terminus-core'
+import { ConfigService, HostAppService, Platform, ElectronService, getCSSFontFamily } from 'terminus-core'
 import { TerminalColorSchemeProvider } from '../api/colorSchemeProvider'
 import { TerminalColorScheme } from '../api/interfaces'
-import { getCSSFontFamily } from '../utils'
 
 /** @hidden */
 @Component({

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

@@ -53,6 +53,15 @@
             [(model)]='profile.sessionOptions.env',
         )
 
+    .form-group
+        label Tab color
+        input.form-control(
+            type='text',
+            autofocus,
+            [(ngModel)]='profile.color',
+            placeholder='#000000'
+        )
+
 .modal-footer
     button.btn.btn-outline-primary((click)='save()') Save
     button.btn.btn-outline-danger((click)='cancel()') Cancel

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

@@ -2,11 +2,10 @@ import slug from 'slug'
 import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subscription } from 'rxjs'
-import { ConfigService, ElectronService, HostAppService, Platform } from 'terminus-core'
+import { ConfigService, ElectronService, HostAppService, Platform, WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild } from 'terminus-core'
 import { EditProfileModalComponent } from './editProfileModal.component'
 import { Shell, Profile } from '../api/interfaces'
 import { TerminalService } from '../services/terminal.service'
-import { WIN_BUILD_CONPTY_SUPPORTED, WIN_BUILD_CONPTY_STABLE, isWindowsBuild } from '../utils'
 
 /** @hidden */
 @Component({

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

@@ -1,11 +1,10 @@
 import { Component, Input } from '@angular/core'
 import { Subscription } from 'rxjs'
 import { first } from 'rxjs/operators'
-import { BaseTabProcess } from 'terminus-core'
+import { BaseTabProcess, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core'
 import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component'
 import { SessionOptions } from '../api/interfaces'
 import { Session } from '../services/sessions.service'
-import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from '../utils'
 
 /** @hidden */
 @Component({
@@ -65,6 +64,7 @@ export class TerminalTabComponent extends BaseTerminalTabComponent {
                 ...this.sessionOptions,
                 cwd: cwd || this.sessionOptions.cwd,
             },
+            savedState: this.frontend?.saveState(),
         }
     }
 

terminus-terminal/src/contextMenu.ts

@@ -1,98 +0,0 @@
-import { NgZone, Injectable } from '@angular/core'
-import { ToastrService } from 'ngx-toastr'
-import { ConfigService } from 'terminus-core'
-import { UACService } from './services/uac.service'
-import { TerminalService } from './services/terminal.service'
-import { TerminalContextMenuItemProvider } from './api/contextMenuProvider'
-import { BaseTerminalTabComponent } from './api/baseTerminalTab.component'
-
-/** @hidden */
-@Injectable()
-export class NewTabContextMenu extends TerminalContextMenuItemProvider {
-    weight = 0
-
-    constructor (
-        public config: ConfigService,
-        private zone: NgZone,
-        private terminalService: TerminalService,
-        private uac: UACService,
-    ) {
-        super()
-    }
-
-    async getItems (tab: BaseTerminalTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        const profiles = await this.terminalService.getProfiles()
-
-        const items: Electron.MenuItemConstructorOptions[] = [
-            {
-                label: 'New terminal',
-                click: () => this.zone.run(() => {
-                    this.terminalService.openTabWithOptions((tab as any).sessionOptions)
-                }),
-            },
-            {
-                label: 'New with profile',
-                submenu: profiles.map(profile => ({
-                    label: profile.name,
-                    click: () => this.zone.run(async () => {
-                        const workingDirectory = this.config.store.terminal.alwaysUseWorkingDirectory === true ?
-                            this.config.store.terminal.workingDirectory : await tab.session.getWorkingDirectory()
-                        await this.terminalService.openTab(profile, workingDirectory)
-                    }),
-                })),
-            },
-        ]
-
-        if (this.uac.isAvailable) {
-            items.push({
-                label: 'New admin tab',
-                submenu: profiles.map(profile => ({
-                    label: profile.name,
-                    click: () => this.zone.run(async () => {
-                        this.terminalService.openTabWithOptions({
-                            ...profile.sessionOptions,
-                            runAsAdministrator: true,
-                        })
-                    }),
-                })),
-            })
-        }
-
-        return items
-    }
-}
-
-/** @hidden */
-@Injectable()
-export class CopyPasteContextMenu extends TerminalContextMenuItemProvider {
-    weight = 1
-
-    constructor (
-        private zone: NgZone,
-        private toastr: ToastrService,
-    ) {
-        super()
-    }
-
-    async getItems (tab: BaseTerminalTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
-        return [
-            {
-                label: 'Copy',
-                click: () => {
-                    this.zone.run(() => {
-                        setTimeout(() => {
-                            tab.frontend.copySelection()
-                            this.toastr.info('Copied')
-                        })
-                    })
-                },
-            },
-            {
-                label: 'Paste',
-                click: () => {
-                    this.zone.run(() => tab.paste())
-                },
-            },
-        ]
-    }
-}

terminus-terminal/src/debug.ts

@@ -0,0 +1,69 @@
+import * as fs from 'fs'
+import { Injectable } from '@angular/core'
+import { TerminalDecorator } from './api/decorator'
+import { TerminalTabComponent } from './components/terminalTab.component'
+import { ElectronService, HostAppService } from 'terminus-core'
+
+/** @hidden */
+@Injectable()
+export class DebugDecorator extends TerminalDecorator {
+    constructor (
+        private electron: ElectronService,
+        private hostApp: HostAppService,
+    ) {
+        super()
+    }
+
+    attach (terminal: TerminalTabComponent): void {
+        terminal.content.nativeElement.addEventListener('keyup', e => {
+            if (e.which === 49 && e.ctrlKey && e.shiftKey && e.altKey) {
+                this.doSaveOutput(terminal)
+            }
+            if (e.which === 50 && e.ctrlKey && e.shiftKey && e.altKey) {
+                this.doLoadInput(terminal)
+            }
+            if (e.which === 51 && e.ctrlKey && e.shiftKey && e.altKey) {
+                this.doCopyOutput(terminal)
+            }
+            if (e.which === 52 && e.ctrlKey && e.shiftKey && e.altKey) {
+                this.doPasteOutput(terminal)
+            }
+        })
+    }
+
+    async doSaveOutput (terminal: TerminalTabComponent) {
+        const result = await this.electron.dialog.showSaveDialog(
+            this.hostApp.getWindow(),
+            {
+                defaultPath: 'output.txt',
+            },
+        )
+        if (result.filePath) {
+            fs.writeFileSync(result.filePath, terminal.frontend.saveState())
+        }
+    }
+
+    async doCopyOutput (terminal: TerminalTabComponent) {
+        const data = '```' + JSON.stringify(terminal.frontend.saveState()) + '```'
+        this.electron.clipboard.writeText(data)
+    }
+
+    async doLoadInput (terminal: TerminalTabComponent) {
+        const result = await this.electron.dialog.showOpenDialog(
+            this.hostApp.getWindow(),
+            {
+                buttonLabel: 'Load',
+                properties: ['openFile', 'treatPackageAsDirectory'],
+            },
+        )
+        if (result.filePaths.length) {
+            const data = fs.readFileSync(result.filePaths[0])
+            terminal.frontend.restoreState(data)
+        }
+    }
+
+    async doPasteOutput (terminal: TerminalTabComponent) {
+        const data = JSON.parse(this.electron.clipboard.readText())
+        terminal.frontend.restoreState(data)
+    }
+}

terminus-terminal/src/frontends/frontend.ts

@@ -74,4 +74,7 @@ export abstract class Frontend {
 
     abstract findNext (term: string, searchOptions?: SearchOptions): boolean
     abstract findPrevious (term: string, searchOptions?: SearchOptions): boolean
+
+    abstract saveState (): any
+    abstract restoreState (state: any): void
 }

terminus-terminal/src/frontends/htermFrontend.ts

@@ -1,6 +1,6 @@
 import { Frontend, SearchOptions } from './frontend'
 import { hterm, preferenceManager } from './hterm'
-import { getCSSFontFamily } from '../utils'
+import { getCSSFontFamily } from 'terminus-core'
 
 /** @hidden */
 export class HTermFrontend extends Frontend {
@@ -164,6 +164,12 @@ export class HTermFrontend extends Frontend {
         return false
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    saveState (): any { }
+
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    restoreState (_state: any): void { }
+
     private setFontSize () {
         const size = this.configuredFontSize * Math.pow(1.1, this.zoom)
         preferenceManager.set('font-size', size)

terminus-terminal/src/frontends/xtermFrontend.ts

@@ -1,10 +1,12 @@
+import { getCSSFontFamily } from 'terminus-core'
 import { Frontend, SearchOptions } from './frontend'
 import { Terminal, ITheme } from 'xterm'
-import { getCSSFontFamily } from '../utils'
 import { FitAddon } from 'xterm-addon-fit'
 import { LigaturesAddon } from 'xterm-addon-ligatures'
 import { SearchAddon } from 'xterm-addon-search'
 import { WebglAddon } from 'xterm-addon-webgl'
+import { Unicode11Addon } from 'xterm-addon-unicode11'
+import { SerializeAddon } from 'xterm-addon-serialize'
 import './xterm.css'
 import deepEqual from 'deep-equal'
 import { Attributes } from 'xterm/src/common/buffer/Constants'
@@ -23,12 +25,14 @@ export class XTermFrontend extends Frontend {
     protected enableWebGL = false
     private xterm: Terminal
     private configuredFontSize = 0
+    private configuredLinePadding = 0
     private zoom = 0
     private resizeHandler: () => void
     private configuredTheme: ITheme = {}
     private copyOnSelect = false
     private search = new SearchAddon()
     private fitAddon = new FitAddon()
+    private serializeAddon = new SerializeAddon()
     private ligaturesAddon: LigaturesAddon
     private opened = false
 
@@ -56,7 +60,11 @@ export class XTermFrontend extends Frontend {
                 this.copySelection()
             }
         })
+
         this.xterm.loadAddon(this.fitAddon)
+        this.xterm.loadAddon(this.serializeAddon)
+        this.xterm.loadAddon(new Unicode11Addon())
+        this.xterm.unicode.activeVersion = '11'
 
         const keyboardEventHandler = (name: string, event: KeyboardEvent) => {
             this.hotkeysService.pushKeystroke(name, event)
@@ -208,13 +216,14 @@ export class XTermFrontend extends Frontend {
         this.xterm.setOption('macOptionIsMeta', config.terminal.altIsMeta)
         this.xterm.setOption('scrollback', 100000)
         this.configuredFontSize = config.terminal.fontSize
+        this.configuredLinePadding = config.terminal.linePadding
         this.setFontSize()
 
         this.copyOnSelect = config.terminal.copyOnSelect
 
         const theme: ITheme = {
             foreground: config.terminal.colorScheme.foreground,
-            background: config.terminal.background === 'colorScheme' ? config.terminal.colorScheme.background : config.appearance.vibrancy ? '#00000000' : this.themesService.findCurrentTheme().terminalBackground,
+            background: config.terminal.background === 'colorScheme' ? config.terminal.colorScheme.background : '#00000000',
             cursor: config.terminal.colorScheme.cursor,
         }
 
@@ -246,8 +255,19 @@ export class XTermFrontend extends Frontend {
         return this.search.findPrevious(term, searchOptions)
     }
 
+    saveState (): any {
+        return this.serializeAddon.serialize()
+    }
+
+    restoreState (state: any): void {
+        this.xterm.write(state)
+    }
+
     private setFontSize () {
-        this.xterm.setOption('fontSize', this.configuredFontSize * Math.pow(1.1, this.zoom))
+        const scale = Math.pow(1.1, this.zoom)
+        this.xterm.setOption('fontSize', this.configuredFontSize * scale)
+        // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+        this.xterm.setOption('lineHeight', (this.configuredFontSize + this.configuredLinePadding * 2) / this.configuredFontSize)
         this.resizeHandler()
     }
 

terminus-terminal/src/icons/alpine.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 57" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" width="300" height="300" font-family="Roboto" font-size="14px" text-anchor="middle"><defs><style type="text/css"></style></defs><use xlink:href="#A" x=".5" y=".5"></use><symbol id="A" overflow="visible"><g stroke="none" fill="#0d597f" fill-rule="nonzero"><path d="M23.252 34.527v-6.745l-4.855 4.864c.474.333.968.635 1.48.906.463.243.87.434 1.303.58a7.97 7.97 0 0 0 1.13.304c.348.064.66.093.95.096m24.822-.562a1.17 1.17 0 0 0 .142.1c.123.078.252.145.385.203a2.93 2.93 0 0 0 .637.194c.296.06.598.088.9.087a5.84 5.84 0 0 0 .955-.087 7.24 7.24 0 0 0 1.138-.301c.453-.16.895-.354 1.32-.58.52-.274 1.02-.58 1.503-.918l-3.685-3.6-12.2-12.258-5.356 5.356-7.23-7.455L8.44 32.647c.48.337.98.644 1.5.918.47.246.9.434 1.317.58a7.18 7.18 0 0 0 1.135.301 5.53 5.53 0 0 0 .955.087 4.53 4.53 0 0 0 .9-.087 3.29 3.29 0 0 0 .637-.194c.134-.054.263-.12.385-.197l.145-.104 8.193-8.193 2.924-2.808 8.106 8.106 2.837 2.912c.046.037.094.07.145.1.122.078.25.145.385.2a3.49 3.49 0 0 0 .637.194c.255.052.556.087.903.087a5.84 5.84 0 0 0 .955-.087c.387-.068.768-.168 1.138-.3a9.94 9.94 0 0 0 1.32-.579c.52-.274 1.02-.58 1.503-.918l-6.508-6.37 1.2-1.2 5.63 5.63 3.283 3.254M47.996.02l15.998 27.714-15.99 27.694H15.998L0 27.714 15.998 0z"></path><path d="M38.022 26.367L33.76 22.11l.304-.304 4.3 4.244z"></path></g></symbol></svg>

terminus-terminal/src/icons/linux.svg

@@ -0,0 +1,122 @@
+
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="295px" viewBox="0 0 256 295" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <defs>
+        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="6.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+        </filter>
+        <linearGradient x1="48.5477412%" y1="115.276174%" x2="51.0473804%" y2="41.3637237%" id="linearGradient-2">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="54.4065463%" y1="2.40410545%" x2="46.1753957%" y2="90.5422349%" id="linearGradient-3">
+            <stop stop-color="#FFFFFF" stop-opacity="0.8" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="51.859653%" y1="88.2477484%" x2="47.9469396%" y2="9.74782136%" id="linearGradient-4">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.9251097%" y1="85.4900173%" x2="49.9236843%" y2="13.8109272%" id="linearGradient-5">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="53.9014071%" y1="3.10177585%" x2="45.9555354%" y2="93.8949571%" id="linearGradient-6">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="45.5928761%" y1="5.47459052%" x2="54.811359%" y2="93.5235162%" id="linearGradient-7">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.9844987%" y1="89.8452442%" x2="49.9844987%" y2="40.6316864%" id="linearGradient-8">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="53.5047131%" y1="99.97524%" x2="42.7455968%" y2="23.5451715%" id="linearGradient-9">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.8413363%" y1="13.2289558%" x2="50.2412612%" y2="94.6729694%" id="linearGradient-10">
+            <stop stop-color="#FFFFFF" stop-opacity="0.8" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.9272298%" y1="37.3270337%" x2="50.7270446%" y2="92.7824735%" id="linearGradient-11">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.8755597%" y1="2.29900584%" x2="49.8755597%" y2="81.203617%" id="linearGradient-12">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.8334391%" y1="2.27189065%" x2="49.8240398%" y2="71.7989617%" id="linearGradient-13">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="53.4670683%" y1="48.9213861%" x2="38.9488708%" y2="98.0999776%" id="linearGradient-14">
+            <stop stop-color="#FFA63F" offset="0%"></stop>
+            <stop stop-color="#FFFF00" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="52.3731508%" y1="143.008909%" x2="47.57909%" y2="-64.6215389%" id="linearGradient-15">
+            <stop stop-color="#FFEED7" offset="0%"></stop>
+            <stop stop-color="#BDBFC2" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="30.580815%" y1="34.0241079%" x2="65.8867024%" y2="89.175349%" id="linearGradient-16">
+            <stop stop-color="#FFA63F" offset="0%"></stop>
+            <stop stop-color="#FFFF00" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="59.5715091%" y1="-17.2155207%" x2="48.3608522%" y2="66.1184465%" id="linearGradient-17">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="47.7689553%" y1="1.56481301%" x2="51.3733028%" y2="104.312856%" id="linearGradient-18">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="43.5495626%" y1="4.5334861%" x2="57.1143288%" y2="92.8267174%" id="linearGradient-19">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="49.7328042%" y1="17.6085216%" x2="50.5582487%" y2="99.3854667%" id="linearGradient-20">
+            <stop stop-color="#FFA63F" offset="0%"></stop>
+            <stop stop-color="#FFFF00" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50.1697217%" y1="2.89048531%" x2="49.6802359%" y2="94.1704279%" id="linearGradient-21">
+            <stop stop-color="#FFFFFF" stop-opacity="0.65" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g fill="none">
+        <g transform="translate(10.000000, 0.000000)">
+            <path d="M235.125423,249.358628 C235.125423,266.714271 182.507524,280.855905 117.584567,280.855905 C52.6616093,280.855905 0.0437105058,266.806099 0.0437105058,249.358628 L0.0437105058,249.358628 C0.0437105058,232.002986 52.6616093,217.861352 117.584567,217.861352 C182.507524,217.861352 235.033594,232.002986 235.125423,249.358628 L235.125423,249.358628 L235.125423,249.358628 Z" fill="#000" fill-opacity="0.2" filter="url(#filter-1)"></path>
+            <path d="M53.2125821,215.473804 C41.8258117,199.128278 39.6219206,145.867578 66.160442,113.084699 C79.2919595,97.3819748 82.6896249,86.4543483 83.6997416,71.6699125 C84.434372,54.8652433 71.8538272,4.81855066 119.237485,1.05357012 C167.263944,-2.80323922 164.600909,44.5804184 164.325423,69.6496791 C164.141765,90.7703016 179.844489,102.799874 190.680286,119.329056 C210.607135,149.632558 208.954216,201.791313 186.915306,230.074582 C158.999353,265.428667 135.123866,250.093259 119.237485,251.378862 C89.4849556,253.123609 88.4748389,268.918162 53.2125821,215.473804 L53.2125821,215.473804 Z" fill="#000000"></path>
+            <path d="M169.10052,122.451235 C177.365111,130.073025 198.76122,164.141508 164.876395,185.445788 C152.938652,192.88392 175.528535,221.167189 186.364333,207.484699 C205.556551,182.874582 193.343321,143.571858 181.772893,129.522053 C174.059275,119.604543 162.121532,115.747734 169.10052,122.451235 L169.10052,122.451235 Z" fill="url(#linearGradient-2)"></path>
+            <path d="M166.8048,117.859796 C180.395461,128.879251 205.097407,167.447344 169.008691,192.608434 C157.162777,200.413881 179.477174,225.115827 192.057718,212.535282 C235.676395,168.641119 190.955773,118.227111 175.528535,100.871469 C161.754216,85.719718 149.540987,104.360963 166.8048,117.859796 L166.8048,117.859796 Z" stroke="#000000" stroke-width="0.9773" fill="#000000"></path>
+            <path d="M147.245267,25.0208853 C146.786123,37.60143 132.919975,48.5290565 116.298963,49.5391732 C99.6779518,50.54929 86.638263,40.9990954 87.097407,28.4185507 L87.097407,28.4185507 C87.556551,15.8380059 101.422699,4.91037946 118.043711,3.90026272 C134.664722,2.98197479 147.704411,12.4403405 147.245267,25.0208853 L147.245267,25.0208853 L147.245267,25.0208853 Z" fill="url(#linearGradient-3)"></path>
+            <path d="M107.483399,54.9570721 C107.942543,63.1298347 104.085734,70.0169942 98.7596638,70.2924806 C93.4335938,70.567967 88.7503253,64.2317802 88.2911813,56.0590176 L88.2911813,56.0590176 C87.8320374,47.8862549 91.6888467,40.9990954 97.0149167,40.723609 C102.340987,40.4481226 107.024255,46.7843094 107.483399,54.9570721 L107.483399,54.9570721 L107.483399,54.9570721 Z" fill="url(#linearGradient-4)"></path>
+            <path d="M117.125423,55.5998736 C117.30908,65.0582394 123.461609,72.5882005 130.807913,72.4045429 C138.154216,72.2208853 143.93943,64.4154378 143.755773,54.8652433 L143.755773,54.8652433 C143.572115,45.4068775 137.419586,37.8769164 130.073282,38.060574 C122.726979,38.2442316 116.849936,46.1415079 117.125423,55.5998736 L117.125423,55.5998736 L117.125423,55.5998736 Z" fill="url(#linearGradient-5)"></path>
+            <path d="M123.186123,57.7119359 C123.094294,62.9461771 125.6655,67.1703016 129.063166,67.1703016 C132.369002,67.1703016 135.215695,62.9461771 135.307524,57.8037647 L135.307524,57.8037647 C135.399353,52.5695234 132.828146,48.3453989 129.430481,48.3453989 C126.032816,48.3453989 123.277952,52.5695234 123.186123,57.7119359 L123.186123,57.7119359 L123.186123,57.7119359 Z" fill="#000000"></path>
+            <path d="M101.973672,57.8037647 C102.432816,62.119718 100.779897,65.7928697 98.3923486,66.1601849 C96.0048,66.4356713 93.7090802,63.2216635 93.2499362,58.9057102 L93.2499362,58.9057102 C92.7907922,54.5897569 94.4437105,50.9166051 96.8312591,50.54929 C99.2188078,50.2738036 101.514528,53.4878114 101.973672,57.8037647 L101.973672,57.8037647 L101.973672,57.8037647 Z" fill="#000000"></path>
+            <path d="M124.563555,54.7734145 C124.288068,57.7119359 125.6655,60.0994845 127.593905,60.2831421 C129.52231,60.4667997 131.358886,58.1710798 131.634372,55.3243872 L131.634372,55.3243872 C131.909858,52.3858658 130.532426,49.9983172 128.604022,49.8146596 C126.675617,49.631002 124.839041,51.9267219 124.563555,54.7734145 L124.563555,54.7734145 L124.563555,54.7734145 Z" fill="url(#linearGradient-6)"></path>
+            <path d="M99.9534381,55.5080448 C100.228925,57.8955935 99.2188078,60.0076557 97.7495471,60.1913133 C96.2802864,60.3749709 94.9028545,58.538395 94.6273681,56.0590176 L94.6273681,56.0590176 C94.3518817,53.6714689 95.3619984,51.5594067 96.8312591,51.3757491 C98.3005198,51.1920915 99.6779518,53.1204962 99.9534381,55.5080448 L99.9534381,55.5080448 L99.9534381,55.5080448 Z" fill="url(#linearGradient-7)"></path>
+            <path d="M71.0273681,145.68392 C77.5472125,130.899485 91.4133603,104.911936 91.6888467,84.80143 C91.6888467,68.8232199 139.531648,64.9664106 143.388458,80.9446207 C147.245267,96.9228308 156.979119,120.798317 163.223477,132.368745 C169.467835,143.847344 187.558107,180.487033 168.274061,212.443453 C150.918419,240.726722 98.3005198,263.132948 70.2009089,208.586644 C60.6507144,189.669913 62.3954615,166.25357 71.0273681,145.68392 L71.0273681,145.68392 Z" fill="url(#linearGradient-8)"></path>
+            <path d="M65.1503253,134.664465 C59.5487689,145.224776 47.9783409,172.957072 76.2616093,188.108823 C106.65694,204.270691 106.565111,237.420885 70.0172514,221.626333 C36.5915704,207.39287 51.3760062,149.724387 60.7425432,135.950068 C66.8032436,126.308045 75.986123,114.46213 65.1503253,134.664465 L65.1503253,134.664465 Z" fill="url(#linearGradient-9)"></path>
+            <path d="M69.9254226,122.726722 C61.0180296,137.235671 39.7137494,171.395983 68.2725043,189.210769 C106.65694,212.810769 95.8211424,236.31894 60.7425432,215.106488 C11.3386521,185.537617 54.7736716,125.848901 74.5168623,103.07536 C97.1067455,77.5469553 78.8328156,107.758628 69.9254226,122.726722 L69.9254226,122.726722 Z" stroke="#000000" stroke-width="1.25" fill="#000000"></path>
+            <path d="M156.428146,151.285477 C156.428146,167.447344 140.90908,188.384309 114.27873,188.200652 C86.8219206,188.384309 75.1596638,167.447344 75.1596638,151.285477 C75.1596638,135.123609 93.341765,121.992092 115.747991,121.992092 C138.246045,122.08392 156.428146,135.123609 156.428146,151.285477 L156.428146,151.285477 Z" fill="url(#linearGradient-10)"></path>
+            <path d="M141.919197,100.504154 C141.643711,117.216994 130.716084,121.165632 116.941765,121.165632 C103.167446,121.165632 93.1581074,118.686255 91.9643331,100.504154 C91.9643331,89.1173833 103.167446,82.5057102 116.941765,82.5057102 C130.716084,82.4138814 141.919197,89.0255546 141.919197,100.504154 L141.919197,100.504154 Z" fill="url(#linearGradient-11)"></path>
+            <path d="M58.6304809,126.216216 C67.6297027,112.533726 86.638263,91.504932 62.2118039,129.154737 C42.3767844,160.19287 54.8655004,180.119718 61.293516,185.629446 C79.8429323,202.158628 79.1083019,213.269913 64.5075237,204.546177 C33.1939051,185.904932 39.7137494,154.499485 58.6304809,126.216216 L58.6304809,126.216216 Z" fill="url(#linearGradient-12)"></path>
+            <path d="M188.935539,131.817772 C181.130092,115.747734 156.336318,74.9757491 190.129314,122.359407 C220.89196,165.243453 199.312193,195.087811 195.455384,198.026333 C191.598574,200.964854 178.650714,206.933726 182.415695,196.557072 C186.272504,186.180418 205.372893,166.529056 188.935539,131.817772 L188.935539,131.817772 Z" fill="url(#linearGradient-13)"></path>
+            <path d="M51.8351502,258.541508 C31.2655004,247.613881 1.42114241,260.65357 12.2569401,231.084699 C14.4608311,224.381197 9.0429323,214.280029 12.5324265,207.760185 C16.6647222,199.77108 25.5721152,201.515827 30.8981852,196.189757 C36.1324265,190.680029 39.438263,181.129835 49.263944,182.599095 C58.9977961,184.068356 65.5176405,196.006099 72.3129712,210.698706 C77.3635549,221.167189 95.1783409,235.951625 93.9845665,247.70571 C92.5153058,265.704154 72.0374848,269.101819 51.8351502,258.541508 L51.8351502,258.541508 Z" stroke="#E68C3F" stroke-width="6.25" fill="url(#linearGradient-14)"></path>
+            <path d="M201.607913,189.11894 C198.485734,194.995983 185.446045,204.454348 176.72231,201.974971 C167.906746,199.587422 163.866279,186.180418 165.611026,175.987422 C167.263944,164.600652 176.72231,163.95785 188.660053,169.651235 C201.516084,175.987422 205.372893,181.313492 201.607913,189.11894 L201.607913,189.11894 Z" fill="url(#linearGradient-15)"></path>
+            <path d="M194.445267,253.490924 C209.505189,235.216994 243.022699,238.981975 220.432816,213.912714 C215.657718,208.494815 217.126979,196.924387 211.249936,191.965632 C204.362777,185.904932 196.740987,190.863687 189.761998,187.741508 C182.78301,184.343842 175.436707,177.823998 166.896629,182.415438 C158.356551,187.098706 157.438263,199.220107 156.611804,215.198317 C155.877174,226.676916 145.408691,245.869134 151.010247,256.429446 C159.091181,272.774971 180.119975,270.57108 194.445267,253.490924 L194.445267,253.490924 Z" stroke="#E68C3F" stroke-width="6.2507" fill="url(#linearGradient-16)"></path>
+            <path d="M187.925423,229.064465 C211.249936,194.628667 193.894294,194.904154 188.017251,192.241119 C182.140209,189.486255 175.987679,184.068356 169.10052,187.833337 C162.21336,191.690146 161.846045,201.607656 161.662388,214.647344 C161.386901,224.013881 153.581454,239.716605 158.264722,248.440341 C163.958107,258.633337 177.732426,243.848901 187.925423,229.064465 L187.925423,229.064465 Z" fill="url(#linearGradient-17)"></path>
+            <path d="M47.0600529,234.02322 C12.1651113,211.433337 28.5106366,203.719718 33.7448778,200.138395 C40.0810646,195.546955 40.1728934,186.731391 47.9783409,187.55785 C55.7837883,188.384309 60.375228,198.026333 65.6094693,209.964076 C69.4662786,218.504154 82.8732825,229.890924 81.8631658,239.716605 C80.5775626,251.287033 62.1199751,243.665243 47.0600529,234.02322 L47.0600529,234.02322 Z" fill="url(#linearGradient-18)"></path>
+            <path d="M199.587679,188.843453 C196.832816,193.618551 185.629703,201.148512 178.19157,199.128278 C170.569781,197.199874 167.080286,186.455905 168.641376,178.374971 C170.018808,169.192092 178.19157,168.732948 188.476395,173.324387 C199.404022,178.283142 202.801687,182.507267 199.587679,188.843453 L199.587679,188.843453 Z" fill="#000000"></path>
+            <path d="M192.057718,186.180418 C190.312971,189.486255 182.966668,194.720496 177.824255,193.343064 C172.681843,191.965632 170.110637,184.5275 170.937096,178.925944 C171.671726,172.589757 177.181454,172.222442 184.160442,175.344621 C191.690403,178.834115 194.077952,181.772636 192.057718,186.180418 L192.057718,186.180418 Z" fill="url(#linearGradient-19)"></path>
+            <path d="M97.1067455,66.3438425 C100.779897,62.9461771 109.68729,52.5695234 126.583788,63.4053211 C129.705967,65.4255546 132.277174,65.6092121 138.246045,68.1804184 C150.275617,73.1391732 144.582232,85.0769164 131.726201,89.1173833 C126.216473,90.8621304 121.257718,97.5656324 111.340209,96.9228308 C102.800131,96.4636868 100.59624,90.8621304 95.3619984,87.8317802 C86.0872903,82.597539 84.7098584,75.5267219 89.760442,71.7617413 C94.8110257,67.9967608 96.7394304,66.6193289 97.1067455,66.3438425 L97.1067455,66.3438425 Z" stroke="#E68C3F" stroke-width="3.75" fill="url(#linearGradient-20)"></path>
+            <path d="M138.429703,75.9858658 C133.379119,76.2613522 122.451493,87.1889787 110.972893,87.1889787 C99.4942942,87.1889787 92.6071346,76.5368386 90.8623875,76.5368386" stroke="#E68C3F" stroke-width="2.5"></path>
+            <path d="M102.800131,65.4255546 C104.636707,63.7726363 110.421921,59.2730254 118.043711,63.8644651 C119.696629,64.782753 121.349547,65.7928697 123.737096,67.1703016 C128.604022,70.0169942 126.216473,74.14929 120.33943,76.7204962 C117.676395,77.8224417 113.268613,80.2099904 109.962777,80.0263328 C106.289625,79.6590176 103.810247,77.2714689 101.422699,75.7103795 C96.9230879,72.7718581 97.1985743,70.2924806 99.3106366,68.364076 C100.871726,66.8948153 102.616473,65.5173833 102.800131,65.4255546 L102.800131,65.4255546 Z" fill="url(#linearGradient-21)"></path>
+        </g>
+    </g>
+</svg>

terminus-terminal/src/icons/suse.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 256 256.00001"
+   height="256"
+   width="256">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(6.9999999,0,0,6.9999736,16,-7617.6082)"
+     id="layer1"
+     style="fill:#73ba25;fill-opacity:1">
+    <g
+       style="fill:#73ba25;fill-opacity:1"
+       transform="matrix(0.26458333,0,0,0.26458333,-10.590624,-38.473045)"
+       id="g838">
+      <circle
+         r="0"
+         cy="3582.8301"
+         cx="507.46362"
+         id="path872"
+         style="opacity:0.3;fill:#73ba25;fill-opacity:1;stroke:none;stroke-width:1.90573967;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path819"
+         d="m 100.5002,4267.059 a 60.472077,60.472442 0 0 0 -47.607132,23.2988 c 7.375955,1.9706 12.596534,3.6642 14.160064,4.1895 0.0245,-0.9593 0.183589,-9.5391 0.183589,-9.5391 0,0 0.0202,-0.1964 0.124999,-0.2988 0.13497,-0.1318 0.330078,-0.092 0.330078,-0.092 1.939989,0.281 43.348482,6.4189 60.802382,16.5899 2.15548,1.261 3.21941,2.6017 4.5488,3.9609 4.82477,4.99 11.19998,25.7389 11.88469,30.0176 0.0269,0.1681 -0.18083,0.3507 -0.26953,0.4199 h -0.002 c -0.4957,0.3868 -1.03554,0.789 -1.57616,1.1484 -4.12998,2.7709 -13.64449,9.4312 -25.85142,8.3438 -10.96493,-0.97 -25.290388,-7.2597 -42.560284,-18.6387 1.69799,3.9756 3.371,7.9635 5.04489,11.9492 2.500985,1.299 26.640524,13.5997 38.554464,13.3594 9.59593,-0.1999 19.85892,-4.8804 23.96469,-7.3516 0,0 0.90227,-0.5436 1.29491,-0.2402 0.4295,0.3318 0.31068,0.8402 0.20898,1.3594 -0.25259,1.1786 -0.82764,3.3289 -1.21873,4.3496 l -0.33008,0.832 c -0.46999,1.2592 -0.92111,2.4296 -1.79101,3.1504 -2.41868,2.1993 -6.27908,3.9491 -12.32804,6.5781 -9.34995,4.09 -24.51938,6.6911 -38.603293,6.6016 -5.04437,-0.1123 -9.91781,-0.672 -14.197174,-1.1719 -8.782187,-0.9915 -15.927854,-1.7959 -20.285038,1.3555 a 60.472077,60.472442 0 0 0 45.517305,20.7734 60.472077,60.472442 0 0 0 60.47229,-60.4726 60.472077,60.472442 0 0 0 -60.47229,-60.4727 z m 13.4882,35.0879 c -4.73327,-0.1509 -9.24668,1.5194 -12.70695,4.75 -3.458684,3.2199 -5.437952,7.6097 -5.613251,12.3399 -0.326998,9.7581 7.334241,17.9803 17.083881,18.3398 4.75477,0.1596 9.25839,-1.5118 12.71867,-4.7617 3.44988,-3.2099 5.42915,-7.5999 5.61325,-12.3301 0.335,-9.7494 -7.33546,-17.9889 -17.0956,-18.3379 z m -0.14844,5.2188 c 6.82096,0.242 12.16127,5.972 11.93157,12.791 -0.1053,3.2885 -1.49253,6.3369 -3.90231,8.5976 -2.41329,2.2502 -5.56743,3.4203 -8.87691,3.3203 -6.80516,-0.251 -12.14564,-5.9877 -11.91594,-12.8085 0.1,-3.3008 1.51475,-6.3495 3.91403,-8.5997 2.39919,-2.2502 5.53828,-3.42 8.84956,-3.3007 z m 2.02147,6.2011 c -3.03067,0 -5.47848,1.631 -5.47848,3.6602 0,2.01 2.44781,3.6504 5.47848,3.6504 3.02888,0 5.4863,-1.6405 5.4863,-3.6504 0,-2.0292 -2.45572,-3.6602 -5.4863,-3.6602 z"
+         style="opacity:1;fill:#73ba25;fill-opacity:1;stroke:none;stroke-width:1.90559804;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

terminus-terminal/src/icons/ubuntu.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+	<g>
+		<path d="M255.637396,127.683191 C255.637396,198.196551 198.47207,255.363378 127.954205,255.363378 C57.4348387,255.363378 0.27026393,198.196551 0.27026393,127.683191 C0.27026393,57.1653255 57.4355894,0 127.954205,0 C198.472821,0 255.637396,57.1653255 255.637396,127.683191 L255.637396,127.683191 Z" fill="#DD4814"></path>
+		<path d="M41.1334194,110.63254 C31.7139707,110.63254 24.0827683,118.264493 24.0827683,127.683191 C24.0827683,137.097384 31.7139707,144.728587 41.1334194,144.728587 C50.5476129,144.728587 58.1788152,137.097384 58.1788152,127.683191 C58.1788152,118.264493 50.5476129,110.63254 41.1334194,110.63254 L41.1334194,110.63254 Z M162.848282,188.111202 C154.694569,192.820551 151.898839,203.240727 156.608938,211.389935 C161.313032,219.543648 171.733208,222.338628 179.886921,217.629279 C188.039883,212.925185 190.835613,202.505009 186.126264,194.350545 C181.42217,186.202088 170.995988,183.407109 162.848282,188.111202 L162.848282,188.111202 Z M78.1618299,127.683191 C78.1618299,110.836739 86.5295015,95.9534545 99.3332551,86.9409032 L86.8703343,66.0667683 C71.9555191,76.0365044 60.8581818,91.271132 56.2464282,109.113806 C61.6276833,113.504845 65.0720469,120.189372 65.0720469,127.68244 C65.0720469,135.171003 61.6276833,141.855531 56.2464282,146.246569 C60.852176,164.094499 71.9495132,179.329877 86.8703343,189.299613 L99.3332551,168.420223 C86.5295015,159.412927 78.1618299,144.530393 78.1618299,127.683191 L78.1618299,127.683191 Z M127.954205,77.8855601 C153.967109,77.8855601 175.30895,97.8302874 177.549138,123.265877 L201.839859,122.907777 C200.644692,104.129689 192.441431,87.2719765 179.836622,74.875871 C173.354792,77.3247625 165.86773,76.9501466 159.396411,73.2197537 C152.91383,69.4788504 148.849361,63.1681877 147.738276,56.3177478 C141.438123,54.5790499 134.807648,53.6271202 127.952704,53.6271202 C116.168446,53.6271202 105.026815,56.3950733 95.1344047,61.2913548 L106.979472,82.5175836 C113.351695,79.5521877 120.460387,77.8855601 127.954205,77.8855601 L127.954205,77.8855601 Z M127.954205,177.475566 C120.460387,177.475566 113.351695,175.808188 106.980223,172.843543 L95.1351554,194.069021 C105.027566,198.971308 116.169196,201.740012 127.954205,201.740012 C134.80915,201.740012 141.439625,200.787331 147.739026,199.043378 C148.850111,192.192938 152.916082,185.888282 159.397161,182.140622 C165.872985,178.404223 173.355543,178.036364 179.837372,180.485255 C192.442182,168.08915 200.645443,151.231437 201.84061,132.453349 L177.543883,132.095249 C175.30895,157.537595 153.967859,177.475566 127.954205,177.475566 L127.954205,177.475566 Z M162.842276,67.2446686 C170.995988,71.9532669 181.416915,69.1642933 186.121009,61.0105806 C190.830358,52.856868 188.041384,42.4359413 179.886921,37.7258416 C171.733208,33.0217478 161.313032,35.8167273 156.602182,43.9704399 C151.898839,52.1196481 154.693818,62.5405748 162.842276,67.2446686 L162.842276,67.2446686 Z" fill="#FFFFFF"></path>
+	</g>
+</svg>

terminus-terminal/src/index.ts

@@ -31,12 +31,13 @@ import { TerminalContextMenuItemProvider } from './api/contextMenuProvider'
 import { TerminalColorSchemeProvider } from './api/colorSchemeProvider'
 import { ShellProvider } from './api/shellProvider'
 import { TerminalSettingsTabProvider, AppearanceSettingsTabProvider, ShellSettingsTabProvider } from './settings'
+import { DebugDecorator } from './debug'
 import { PathDropDecorator } from './pathDrop'
 import { TerminalConfigProvider } from './config'
 import { TerminalHotkeyProvider } from './hotkeys'
 import { HyperColorSchemes } from './colorSchemes'
-import { NewTabContextMenu, CopyPasteContextMenu } from './contextMenu'
-import { SaveAsProfileContextMenu } from './tabContextMenu'
+import { NewTabContextMenu, CopyPasteContextMenu, SaveAsProfileContextMenu, LegacyContextMenu } from './tabContextMenu'
+import { ZModemDecorator } from './zmodem'
 
 import { CmderShellProvider } from './shells/cmder'
 import { CustomShellProvider } from './shells/custom'
@@ -76,6 +77,8 @@ import { XTermFrontend, XTermWebGLFrontend } from './frontends/xtermFrontend'
         { provide: HotkeyProvider, useClass: TerminalHotkeyProvider, multi: true },
         { provide: TerminalColorSchemeProvider, useClass: HyperColorSchemes, multi: true },
         { provide: TerminalDecorator, useClass: PathDropDecorator, multi: true },
+        { provide: TerminalDecorator, useClass: ZModemDecorator, multi: true },
+        { provide: TerminalDecorator, useClass: DebugDecorator, multi: true },
 
         { provide: ShellProvider, useClass: WindowsDefaultShellProvider, multi: true },
         { provide: ShellProvider, useClass: MacOSDefaultShellProvider, multi: true },
@@ -90,10 +93,10 @@ import { XTermFrontend, XTermWebGLFrontend } from './frontends/xtermFrontend'
         { provide: ShellProvider, useClass: POSIXShellsProvider, multi: true },
         { provide: ShellProvider, useClass: WSLShellProvider, multi: true },
 
-        { provide: TerminalContextMenuItemProvider, useClass: NewTabContextMenu, multi: true },
-        { provide: TerminalContextMenuItemProvider, useClass: CopyPasteContextMenu, multi: true },
-
+        { provide: TabContextMenuItemProvider, useClass: NewTabContextMenu, multi: true },
+        { provide: TabContextMenuItemProvider, useClass: CopyPasteContextMenu, multi: true },
         { provide: TabContextMenuItemProvider, useClass: SaveAsProfileContextMenu, multi: true },
+        { provide: TabContextMenuItemProvider, useClass: LegacyContextMenu, multi: true },
 
         // For WindowsDefaultShellProvider
         PowerShellCoreShellProvider,

terminus-terminal/src/recoveryProvider.ts

@@ -10,7 +10,10 @@ export class RecoveryProvider extends TabRecoveryProvider {
         if (recoveryToken && recoveryToken.type === 'app:terminal-tab') {
             return {
                 type: TerminalTabComponent,
-                options: { sessionOptions: recoveryToken.sessionOptions },
+                options: {
+                    sessionOptions: recoveryToken.sessionOptions,
+                    savedState: recoveryToken.savedState,
+                },
             }
         }
         return null

terminus-terminal/src/services/sessions.service.ts

@@ -6,19 +6,18 @@ import * as nodePTY from 'node-pty'
 import { Observable, Subject } from 'rxjs'
 import { first } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
-import { Logger, LogService, ConfigService } from 'terminus-core'
+import { Logger, LogService, ConfigService, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core'
 import { exec } from 'mz/child_process'
 import { SessionOptions } from '../api/interfaces'
-import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from '../utils'
 
 /* eslint-disable block-scoped-var */
 
 try {
-    var macOSNativeProcessList = require('macos-native-processlist')  // eslint-disable-line @typescript-eslint/no-var-requires
+    var macOSNativeProcessList = require('macos-native-processlist')  // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 try {
-    var windowsProcessTree = require('windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires
+    var windowsProcessTree = require('windows-process-tree')  // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 
@@ -30,8 +29,8 @@ export interface ChildProcess {
 
 const windowsDirectoryRegex = /([a-zA-Z]:[^\:\[\]\?\"\<\>\|]+)/mi
 const catalinaDataVolumePrefix = '/System/Volumes/Data'
-const OSC1337Prefix = '\x1b]1337;'
-const OSC1337Suffix = '\x07'
+const OSC1337Prefix = Buffer.from('\x1b]1337;')
+const OSC1337Suffix = Buffer.from('\x07')
 
 /**
  * A session object for a [[BaseTerminalTabComponent]]
@@ -42,27 +41,31 @@ export abstract class BaseSession {
     name: string
     truePID: number
     protected output = new Subject<string>()
+    protected binaryOutput = new Subject<Buffer>()
     protected closed = new Subject<void>()
     protected destroyed = new Subject<void>()
-    private initialDataBuffer = ''
+    private initialDataBuffer = Buffer.from('')
     private initialDataBufferReleased = false
 
     get output$ (): Observable<string> { return this.output }
+    get binaryOutput$ (): Observable<Buffer> { return this.binaryOutput }
     get closed$ (): Observable<void> { return this.closed }
     get destroyed$ (): Observable<void> { return this.destroyed }
 
-    emitOutput (data: string) {
+    emitOutput (data: Buffer) {
         if (!this.initialDataBufferReleased) {
-            this.initialDataBuffer += data
+            this.initialDataBuffer = Buffer.concat([this.initialDataBuffer, data])
         } else {
-            this.output.next(data)
+            this.output.next(data.toString())
+            this.binaryOutput.next(data)
         }
     }
 
     releaseInitialDataBuffer () {
         this.initialDataBufferReleased = true
-        this.output.next(this.initialDataBuffer)
-        this.initialDataBuffer = ''
+        this.output.next(this.initialDataBuffer.toString())
+        this.binaryOutput.next(this.initialDataBuffer)
+        this.initialDataBuffer = Buffer.from('')
     }
 
     async destroy (): Promise<void> {
@@ -71,6 +74,7 @@ export abstract class BaseSession {
             this.closed.next()
             this.destroyed.next()
             this.output.complete()
+            this.binaryOutput.complete()
             await this.gracefullyKillProcess()
         }
     }
@@ -129,6 +133,7 @@ export class Session extends BaseSession {
             name: 'xterm-256color',
             cols: options.width || 80,
             rows: options.height || 30,
+            encoding: null,
             cwd,
             env: env,
             // `1` instead of `true` forces ConPTY even if unstable
@@ -150,11 +155,11 @@ export class Session extends BaseSession {
 
         this.open = true
 
-        this.pty.on('data-buffered', data => {
+        this.pty.on('data-buffered', (data: Buffer) => {
             data = this.processOSC1337(data)
             this.emitOutput(data)
             if (process.platform === 'win32') {
-                this.guessWindowsCWD(data)
+                this.guessWindowsCWD(data.toString())
             }
         })
 
@@ -168,7 +173,7 @@ export class Session extends BaseSession {
 
         this.pty.on('close', () => {
             if (this.pauseAfterExit) {
-                this.emitOutput('\r\nPress any key to close\r\n')
+                this.emitOutput(Buffer.from('\r\nPress any key to close\r\n'))
             } else if (this.open) {
                 this.destroy()
             }
@@ -177,19 +182,19 @@ export class Session extends BaseSession {
         this.pauseAfterExit = options.pauseAfterExit || false
     }
 
-    processOSC1337 (data: string) {
+    processOSC1337 (data: Buffer) {
         if (data.includes(OSC1337Prefix)) {
-            const preData = data.substring(0, data.indexOf(OSC1337Prefix))
-            let params = data.substring(data.indexOf(OSC1337Prefix) + OSC1337Prefix.length)
-            const postData = params.substring(params.indexOf(OSC1337Suffix) + OSC1337Suffix.length)
-            params = params.substring(0, params.indexOf(OSC1337Suffix))
+            const preData = data.subarray(0, data.indexOf(OSC1337Prefix))
+            let params = data.subarray(data.indexOf(OSC1337Prefix) + OSC1337Prefix.length)
+            const postData = params.subarray(params.indexOf(OSC1337Suffix) + OSC1337Suffix.length)
+            const paramString = params.subarray(0, params.indexOf(OSC1337Suffix)).toString()
 
-            if (params.startsWith('CurrentDir=')) {
-                this.reportedCWD = params.split('=')[1]
+            if (paramString.startsWith('CurrentDir=')) {
+                this.reportedCWD = paramString.split('=')[1]
                 if (this.reportedCWD.startsWith('~')) {
                     this.reportedCWD = os.homedir() + this.reportedCWD.substring(1)
                 }
-                data = preData + postData
+                data = Buffer.concat([preData, postData])
             }
         }
         return data
@@ -255,15 +260,15 @@ export class Session extends BaseSession {
             await new Promise((resolve) => {
                 this.kill('SIGTERM')
                 setImmediate(() => {
-                    if (!this.open) {
-                        resolve()
-                    } else {
+                    try {
+                        process.kill(this.pty.pid, 0)
+                        // still alive
                         setTimeout(() => {
-                            if (this.open) {
-                                this.kill('SIGKILL')
-                            }
+                            this.kill('SIGKILL')
                             resolve()
                         }, 1000)
+                    } catch {
+                        resolve()
                     }
                 })
             })

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

@@ -88,7 +88,11 @@ export class TerminalService {
             cwd: cwd || undefined,
         }
 
-        return this.openTabWithOptions(sessionOptions)
+        const tab = this.openTabWithOptions(sessionOptions)
+        if (profile?.color) {
+            (this.app.getParentTab(tab) || tab).color = profile.color
+        }
+        return tab
     }
 
     optionsFromShell (shell: Shell): SessionOptions {

terminus-terminal/src/services/uac.service.ts

@@ -1,10 +1,8 @@
 import * as path from 'path'
 import { Injectable } from '@angular/core'
-import { ElectronService } from 'terminus-core'
+import { ElectronService, WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from 'terminus-core'
 import { SessionOptions } from '../api/interfaces'
 
-import { WIN_BUILD_CONPTY_SUPPORTED, isWindowsBuild } from '../utils'
-
 /** @hidden */
 @Injectable({ providedIn: 'root' })
 export class UACService {

terminus-terminal/src/shells/cygwin32.ts

@@ -8,7 +8,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */
@@ -35,6 +35,7 @@ export class Cygwin32ShellProvider extends ShellProvider {
             id: 'cygwin32',
             name: 'Cygwin (32 bit)',
             command: path.join(cygwinPath, 'bin', 'bash.exe'),
+            args: ['--login', '-i'],
             icon: require('../icons/cygwin.svg'),
             env: {
                 TERM: 'cygwin',

terminus-terminal/src/shells/cygwin64.ts

@@ -8,7 +8,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */
@@ -35,6 +35,7 @@ export class Cygwin64ShellProvider extends ShellProvider {
             id: 'cygwin64',
             name: 'Cygwin',
             command: path.join(cygwinPath, 'bin', 'bash.exe'),
+            args: ['--login', '-i'],
             icon: require('../icons/cygwin.svg'),
             env: {
                 TERM: 'cygwin',

terminus-terminal/src/shells/gitBash.ts

@@ -8,7 +8,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */

terminus-terminal/src/shells/powershellCore.ts

@@ -6,7 +6,7 @@ import { Shell } from '../api/interfaces'
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
 /** @hidden */

terminus-terminal/src/shells/wsl.ts

@@ -2,18 +2,33 @@ import * as fs from 'mz/fs'
 import slug from 'slug'
 
 import { Injectable } from '@angular/core'
-import { HostAppService, Platform } from 'terminus-core'
+import { HostAppService, Platform, isWindowsBuild, WIN_BUILD_WSL_EXE_DISTRO_FLAG } from 'terminus-core'
 
 import { ShellProvider } from '../api/shellProvider'
 import { Shell } from '../api/interfaces'
-import { isWindowsBuild, WIN_BUILD_WSL_EXE_DISTRO_FLAG } from '../utils'
 
 /* eslint-disable block-scoped-var */
 
 try {
-    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires
+    var wnr = require('windows-native-registry') // eslint-disable-line @typescript-eslint/no-var-requires, no-var
 } catch { }
 
+// WSL Distribution List
+// https://docs.microsoft.com/en-us/windows/wsl/install-win10#install-your-linux-distribution-of-choice
+/* eslint-disable quote-props */
+const wslIconMap: { [key: string]: string } = {
+    'Alpine': require('../icons/alpine.svg'),
+    'Debian': require('../icons/debian.svg'),
+    'kali-linux': require('../icons/linux.svg'),
+    'SLES-12': require('../icons/suse.svg'),
+    'openSUSE-Leap-15-1': require('../icons/suse.svg'),
+    'Ubuntu-16.04': require('../icons/ubuntu.svg'),
+    'Ubuntu-18.04': require('../icons/ubuntu.svg'),
+    'Ubuntu': require('../icons/ubuntu.svg'),
+    'Linux': require('../icons/linux.svg'),
+}
+/* eslint-enable quote-props */
+
 /** @hidden */
 @Injectable()
 export class WSLShellProvider extends ShellProvider {
@@ -31,23 +46,33 @@ export class WSLShellProvider extends ShellProvider {
         const bashPath = `${process.env.windir}\\system32\\bash.exe`
         const wslPath = `${process.env.windir}\\system32\\wsl.exe`
 
-        const shells: Shell[] = [{
-            id: 'wsl',
-            name: 'WSL / Default distro',
-            command: wslPath,
-            env: {
-                TERM: 'xterm-color',
-                COLORTERM: 'truecolor',
-            },
-        }]
-
         const lxssPath = 'Software\\Microsoft\\Windows\\CurrentVersion\\Lxss'
         const lxss = wnr.getRegistryKey(wnr.HK.CU, lxssPath)
+        const shells: Shell[] = []
+
+        if (null != lxss && null != lxss.DefaultDistribution) {
+            const defaultDistKey = wnr.getRegistryKey(wnr.HK.CU, lxssPath + '\\' + String(lxss.DefaultDistribution.value))
+            if (defaultDistKey.DistributionName) {
+                const shell: Shell = {
+                    id: 'wsl',
+                    name: 'WSL / Default distro',
+                    command: wslPath,
+                    env: {
+                        TERM: 'xterm-color',
+                        COLORTERM: 'truecolor',
+                    },
+                    icon: wslIconMap[defaultDistKey.DistributionName.value],
+                }
+                shells.push(shell)
+            }
+        }
+
         if (!lxss || !lxss.DefaultDistribution || !isWindowsBuild(WIN_BUILD_WSL_EXE_DISTRO_FLAG)) {
             if (await fs.exists(bashPath)) {
                 return [{
                     id: 'wsl',
                     name: 'WSL / Bash on Windows',
+                    icon: wslIconMap['Linux'],
                     command: bashPath,
                     env: {
                         TERM: 'xterm-color',
@@ -64,7 +89,7 @@ export class WSLShellProvider extends ShellProvider {
                 continue
             }
             const name = childKey.DistributionName.value
-            shells.push({
+            const shell: Shell = {
                 id: `wsl-${slug(name)}`,
                 name: `WSL / ${name}`,
                 command: wslPath,
@@ -74,7 +99,9 @@ export class WSLShellProvider extends ShellProvider {
                     TERM: 'xterm-color',
                     COLORTERM: 'truecolor',
                 },
-            })
+                icon: wslIconMap[name],
+            }
+            shells.push(shell)
         }
 
         return shells

terminus-terminal/src/tabContextMenu.ts

@@ -1,9 +1,11 @@
-import { Injectable, NgZone } from '@angular/core'
+import { Injectable, NgZone, Optional, Inject } from '@angular/core'
 import { ToastrService } from 'ngx-toastr'
-import { ConfigService, BaseTabComponent, TabContextMenuItemProvider } from 'terminus-core'
+import { ConfigService, BaseTabComponent, TabContextMenuItemProvider, TabHeaderComponent } from 'terminus-core'
 import { TerminalTabComponent } from './components/terminalTab.component'
 import { UACService } from './services/uac.service'
 import { TerminalService } from './services/terminal.service'
+import { BaseTerminalTabComponent } from './api/baseTerminalTab.component'
+import { TerminalContextMenuItemProvider } from './api/contextMenuProvider'
 
 /** @hidden */
 @Injectable()
@@ -12,13 +14,11 @@ export class SaveAsProfileContextMenu extends TabContextMenuItemProvider {
         private config: ConfigService,
         private zone: NgZone,
         private toastr: ToastrService,
-        private uac: UACService,
-        private terminalService: TerminalService,
     ) {
         super()
     }
 
-    async getItems (tab: BaseTabComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+    async getItems (tab: BaseTabComponent, _tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
         if (!(tab instanceof TerminalTabComponent)) {
             return []
         }
@@ -43,18 +43,143 @@ export class SaveAsProfileContextMenu extends TabContextMenuItemProvider {
             },
         ]
 
+        return items
+    }
+}
+
+/** @hidden */
+@Injectable()
+export class NewTabContextMenu extends TabContextMenuItemProvider {
+    weight = 10
+
+    constructor (
+        public config: ConfigService,
+        private zone: NgZone,
+        private terminalService: TerminalService,
+        private uac: UACService,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        const profiles = await this.terminalService.getProfiles()
+
+        const items: Electron.MenuItemConstructorOptions[] = [
+            {
+                label: 'New terminal',
+                click: () => this.zone.run(() => {
+                    this.terminalService.openTabWithOptions((tab as any).sessionOptions)
+                }),
+            },
+            {
+                label: 'New with profile',
+                submenu: profiles.map(profile => ({
+                    label: profile.name,
+                    click: () => this.zone.run(async () => {
+                        let workingDirectory = this.config.store.terminal.workingDirectory
+                        if (this.config.store.terminal.alwaysUseWorkingDirectory !== true && tab instanceof TerminalTabComponent) {
+                            workingDirectory = await tab.session.getWorkingDirectory()
+                        }
+                        await this.terminalService.openTab(profile, workingDirectory)
+                    }),
+                })),
+            },
+        ]
 
         if (this.uac.isAvailable) {
+            items.push({
+                label: 'New admin tab',
+                submenu: profiles.map(profile => ({
+                    label: profile.name,
+                    click: () => this.zone.run(async () => {
+                        this.terminalService.openTabWithOptions({
+                            ...profile.sessionOptions,
+                            runAsAdministrator: true,
+                        })
+                    }),
+                })),
+            })
+        }
+
+        if (tab instanceof TerminalTabComponent && tabHeader && this.uac.isAvailable) {
             items.push({
                 label: 'Duplicate as administrator',
                 click: () => this.zone.run(async () => {
                     this.terminalService.openTabWithOptions({
-                        ...tab.sessionOptions,
+                        ...(tab as TerminalTabComponent).sessionOptions,
                         runAsAdministrator: true,
                     })
                 }),
             })
         }
+
         return items
     }
 }
+
+/** @hidden */
+@Injectable()
+export class CopyPasteContextMenu extends TabContextMenuItemProvider {
+    weight = 1
+
+    constructor (
+        private zone: NgZone,
+        private toastr: ToastrService,
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTabComponent, tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        if (tabHeader) {
+            return []
+        }
+        if (tab instanceof BaseTerminalTabComponent) {
+            return [
+                {
+                    label: 'Copy',
+                    click: () => {
+                        this.zone.run(() => {
+                            setTimeout(() => {
+                                (tab as BaseTerminalTabComponent).frontend.copySelection()
+                                this.toastr.info('Copied')
+                            })
+                        })
+                    },
+                },
+                {
+                    label: 'Paste',
+                    click: () => {
+                        this.zone.run(() => (tab as BaseTerminalTabComponent).paste())
+                    },
+                },
+            ]
+        }
+        return []
+    }
+}
+
+/** @hidden */
+@Injectable()
+export class LegacyContextMenu extends TabContextMenuItemProvider {
+    weight = 1
+
+    constructor (
+        @Optional() @Inject(TerminalContextMenuItemProvider) protected contextMenuProviders: TerminalContextMenuItemProvider[],
+    ) {
+        super()
+    }
+
+    async getItems (tab: BaseTabComponent, _tabHeader?: TabHeaderComponent): Promise<Electron.MenuItemConstructorOptions[]> {
+        if (!this.contextMenuProviders) {
+            return []
+        }
+        if (tab instanceof BaseTerminalTabComponent) {
+            let items: Electron.MenuItemConstructorOptions[] = []
+            for (const p of this.contextMenuProviders) {
+                items = items.concat(await p.getItems(tab))
+            }
+            return items
+        }
+        return []
+    }
+}

terminus-terminal/src/zmodem.ts

@@ -0,0 +1,179 @@
+/* eslint-disable @typescript-eslint/camelcase */
+import * as ZModem from 'zmodem.js'
+import * as fs from 'fs'
+import * as path from 'path'
+import { Subscription } from 'rxjs'
+import { Injectable } from '@angular/core'
+import { TerminalDecorator } from './api/decorator'
+import { TerminalTabComponent } from './components/terminalTab.component'
+import { LogService, Logger, ElectronService, HostAppService } from 'terminus-core'
+
+const SPACER = '            '
+
+/** @hidden */
+@Injectable()
+export class ZModemDecorator extends TerminalDecorator {
+    private subscriptions: Subscription[] = []
+    private logger: Logger
+    private activeSession: any = null
+
+    constructor (
+        log: LogService,
+        private electron: ElectronService,
+        private hostApp: HostAppService,
+    ) {
+        super()
+        this.logger = log.create('zmodem')
+    }
+
+    attach (terminal: TerminalTabComponent): void {
+        const sentry = new ZModem.Sentry({
+            to_terminal: data => {
+                if (!terminal.enablePassthrough) {
+                    terminal.write(data)
+                }
+            },
+            sender: data => terminal.session.write(Buffer.from(data)),
+            on_detect: async detection => {
+                try {
+                    terminal.enablePassthrough = false
+                    await this.process(terminal, detection)
+                } finally {
+                    terminal.enablePassthrough = true
+                }
+            },
+            on_retract: () => {
+                this.showMessage(terminal, 'transfer cancelled')
+            },
+        })
+        setTimeout(() => {
+            this.subscriptions = [
+                terminal.session.binaryOutput$.subscribe(data => {
+                    const chunkSize = 1024
+                    for (let i = 0; i <= Math.floor(data.length / chunkSize); i++) {
+                        try {
+                            sentry.consume(data.subarray(i * chunkSize, (i + 1) * chunkSize))
+                        } catch (e) {
+                            this.logger.error('protocol error', e)
+                            this.activeSession.abort()
+                            this.activeSession = null
+                            terminal.enablePassthrough = true
+                            return
+                        }
+                    }
+                }),
+            ]
+        })
+    }
+
+    async process (terminal, detection) {
+        this.showMessage(terminal, '[Terminus] ZModem session started')
+        const zsession = detection.confirm()
+        this.activeSession = zsession
+        this.logger.info('new session', zsession)
+
+        if (zsession.type === 'send') {
+            const result = await this.electron.dialog.showOpenDialog(
+                this.hostApp.getWindow(),
+                {
+                    buttonLabel: 'Send',
+                    properties: ['multiSelections', 'openFile', 'treatPackageAsDirectory'],
+                },
+            )
+            if (result.canceled) {
+                zsession.close()
+                return
+            }
+
+            let filesRemaining = result.filePaths.length
+            for (const filePath of result.filePaths) {
+                await this.sendFile(terminal, zsession, filePath, filesRemaining)
+                filesRemaining--
+            }
+            this.activeSession = null
+            await zsession.close()
+        } else {
+            zsession.on('offer', xfer => {
+                this.receiveFile(terminal, xfer)
+            })
+
+            zsession.start()
+
+            await new Promise(resolve => zsession.on('session_end', resolve))
+            this.activeSession = null
+        }
+    }
+
+    detach (_terminal: TerminalTabComponent): void {
+        for (const s of this.subscriptions) {
+            s.unsubscribe()
+        }
+    }
+
+    private async receiveFile (terminal, xfer) {
+        const details = xfer.get_details()
+        this.showMessage(terminal, `🟡  Offered ${details.name}`, true)
+        this.logger.info('offered', xfer)
+        const result = await this.electron.dialog.showSaveDialog(
+            this.hostApp.getWindow(),
+            {
+                defaultPath: details.name,
+            },
+        )
+        if (!result.filePath) {
+            this.showMessage(terminal, `🔴  Rejected ${details.name}`)
+            xfer.skip()
+            return
+        }
+        const stream = fs.createWriteStream(result.filePath)
+        let bytesSent = 0
+        await xfer.accept({
+            on_input: chunk => {
+                stream.write(Buffer.from(chunk))
+                bytesSent += chunk.length
+                this.showMessage(terminal, `🟡  Receiving ${details.name}: ${Math.round(100 * bytesSent / details.size)}%`, true)
+            },
+        })
+        this.showMessage(terminal, `✅  Received ${details.name}`)
+        stream.end()
+    }
+
+    private async sendFile (terminal, zsession, filePath, filesRemaining) {
+        const stat = fs.statSync(filePath)
+        const offer = {
+            name: path.basename(filePath),
+            size: stat.size,
+            mode: stat.mode,
+            mtime: Math.floor(stat.mtimeMs / 1000),
+            files_remaining: filesRemaining,
+            bytes_remaining: stat.size,
+        }
+        this.logger.info('offering', offer)
+        this.showMessage(terminal, `🟡  Offering ${offer.name}`, true)
+
+        const xfer = await zsession.send_offer(offer)
+        if (xfer) {
+            let bytesSent = 0
+            const stream = fs.createReadStream(filePath)
+            stream.on('data', chunk => {
+                xfer.send(chunk)
+                bytesSent += chunk.length
+                this.showMessage(terminal, `🟡  Sending ${offer.name}: ${Math.round(100 * bytesSent / offer.size)}%`, true)
+            })
+            await new Promise(resolve => stream.on('end', resolve))
+            await xfer.end()
+            stream.close()
+            this.showMessage(terminal, `✅  Sent ${offer.name}`)
+        } else {
+            this.showMessage(terminal, `🔴  Other side rejected ${offer.name}`)
+            this.logger.warn('rejected by the other side')
+        }
+    }
+
+    private showMessage (terminal, msg: string, overwrite = false) {
+        terminal.write(Buffer.from(`\r${msg}${SPACER}`))
+        if (!overwrite) {
+            terminal.write(Buffer.from('\r\n'))
+        }
+    }
+}

terminus-terminal/yarn.lock

@@ -12,6 +12,11 @@
   resolved "https://registry.yarnpkg.com/@types/slug/-/slug-0.9.1.tgz#16dbf8b77d73e0a09ce51a96400878f33806ab32"
   integrity sha512-zR/u8WFQ4/6uCIikjI00a5uB084XjgEGNRAvM4a1BL39Bw9yEiDQFiPS2DgJ8lPDkR2Qd/vZ26dCR9XqlKbDqQ==
 
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -22,6 +27,14 @@ connected-domain@^1.0.0:
   resolved "https://registry.yarnpkg.com/connected-domain/-/connected-domain-1.0.0.tgz#bfe77238c74be453a79f0cb6058deeb4f2358e93"
   integrity sha1-v+dyOMdL5FOnnwy2BY3utPI1jpM=
 
+crc-32@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
 dataurl@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dataurl/-/dataurl-0.1.0.tgz#1f4734feddec05ffe445747978d86759c4b33199"
@@ -46,6 +59,11 @@ define-properties@^1.1.2:
   dependencies:
     object-keys "^1.0.12"
 
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
 font-finder@^1.0.3, font-finder@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.0.4.tgz#2ca944954dd8d0e1b5bdc4c596cc08607761d89b"
@@ -141,6 +159,11 @@ opentype.js@^0.8.0:
   dependencies:
     tiny-inflate "^1.0.2"
 
+printj@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
 promise-stream-reader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz#4e793a79c9d49a73ccd947c6da9c127f12923649"
@@ -171,9 +194,9 @@ runes@^0.4.2:
   integrity sha512-K6p9y4ZyL9wPzA+PMDloNQPfoDGTiFYDvdlXznyGKgD10BJpcAosvATKrExRKOrNLgD8E7Um7WGW0lxsnOuNLg==
 
 slug@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slug/-/slug-2.0.0.tgz#842b60f9f827aac045fe5894d8426e9624578f6f"
-  integrity sha512-nsPIR74De90eXwy6vgO23P92YtpddZZ/AjCHWx9+65TWsq/174hOSzn2Q1RL9bG2aYuxwyNZbHp/IbUhLUwUtw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slug/-/slug-2.1.0.tgz#293f8d53de7e55c15871846fd1bc36114841a8c7"
+  integrity sha512-Q4foEgcE7E8UB/BFg4kEzFUICoppzsbbfRjrdKiOM4Z4EFZF5tdn6amkgeaGur3kI4lMWP2BoMv7XJcKZvLg9Q==
   dependencies:
     unicode ">= 0.3.1"
 
@@ -209,9 +232,9 @@ tiny-inflate@^1.0.2:
   integrity sha512-+cHtykLb+eF1yrSLWTwcYBrqJkTfX7Quoyg7Juhe6uylF43ZbMdxMuSHNYlnyLT8T7POAvavgBthzUF9AIaQvQ==
 
 uuid@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 xterm-addon-fit@^0.4.0-beta2:
   version "0.4.0-beta2"
@@ -231,17 +254,34 @@ xterm-addon-search@^0.4.0:
   resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.4.0.tgz#a7beadb3caa7330eb31fb1f17d92de25537684a1"
   integrity sha512-g07qb/Z4aSfrQ25e6Z6rz6KiExm2DvesQXkx+eA715VABBr5VM/9Jf0INoCiDSYy/nn7rpna+kXiGVJejIffKg==
 
-xterm-addon-webgl@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.1.tgz#c245f3310e7dbb0759e5eabaf125bbc9c9ab3955"
-  integrity sha512-z/YRmAji7y3ngjvSgoNCQxqYioarNplNqWv/KgtF4nRkBTWkhLHAg1QFNcH7XxUV/O8VuZoGAfp4LPX2hVz/yQ==
+xterm-addon-serialize@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.1.1.tgz#0fdff59702c00ed8288181198153ec47fd3df8da"
+  integrity sha512-6ykkAnyVsMZhKhUAR6Uml1t8kwpmPqoZm8qERfQX+kI4+m6UGf9ec4SLteDGpYMh/6hLrN7WZqSukfsU3Eof9g==
 
-xterm@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0.tgz#9a302efefe75172d4f7ea3afc20f9bd983f05027"
-  integrity sha512-6dnrC4nxgnRKQzIWwC5HA0mnT9/rpDPZflUIr24gdcdSMTKM1QQcor4qQ/xz4Zerz6AIL/CuuBPypFfzsB63dQ==
+xterm-addon-unicode11@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.1.1.tgz#b209ef137db38096f68636af4ef4d0c0acba85ad"
+  integrity sha512-z6vJTL+dpNljwAYzYoyDjJP8A2XjZuEosl0sRa+FGRf3jEyEVWquDM53MfUd1ztVdAPQ839qR6eYK1BXV04Bhw==
+
+xterm-addon-webgl@^0.5.0-beta.7:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0.tgz#c1031dc7599cce3509824643ab5f15361c928e3e"
+  integrity sha512-hQrvabKCnwXFaEZ+YtoJM9Pm0CIBXL5KSwoU+RiGStU3KYTAcqYP2GsH3dWdvKX6kTWhWLS81dtDsGkfbOciuA==
+
+xterm@^4.4.0-beta.15:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0.tgz#5915d3c4c8800fadbcf555a0a603c672ab9df589"
+  integrity sha512-JGIpigWM3EBWvnS3rtBuefkiToIILSK1HYMXy4BCsUpO+O4UeeV+/U1AdAXgCB6qJrnPNb7yLgBsVCQUNMteig==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+zmodem.js@^0.1.9:
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/zmodem.js/-/zmodem.js-0.1.9.tgz#8dda36d45091bbdf263819f961d3c1a20223daf7"
+  integrity sha512-xixLjW1eML0uiWULsXDInyfwNW9mqESzz7ra+2MWHNG2F5JINEkE5vzF5MigpPcLvrYoHdnehPcJwQZlDph3hQ==
+  dependencies:
+    crc-32 "^1.1.1"