handle auto-updater errors

This reverts commit a8d78ce185.

.all-contributorsrc

@@ -225,6 +225,124 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "LeSeulArtichaut",
+      "name": "LeSeulArtichaut",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/38361244?v=4",
+      "profile": "https://github.com/LeSeulArtichaut",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CyrilTaylor",
+      "name": "Cyril Taylor",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12631466?v=4",
+      "profile": "https://github.com/CyrilTaylor",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nstefanou",
+      "name": "nstefanou",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/51129173?v=4",
+      "profile": "https://github.com/nstefanou",
+      "contributions": [
+        "code",
+        "plugin"
+      ]
+    },
+    {
+      "login": "orin220444",
+      "name": "orin220444",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/30747229?v=4",
+      "profile": "https://github.com/orin220444",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Goobles",
+      "name": "Gobius Dolhain",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/8776771?v=4",
+      "profile": "https://github.com/Goobles",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "3l0w",
+      "name": "Gwilherm Folliot",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/37798980?v=4",
+      "profile": "https://github.com/3l0w",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dimitory",
+      "name": "Dmitry Pronin",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/475955?v=4",
+      "profile": "https://github.com/Dimitory",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JonathanBeverley",
+      "name": "Jonathan Beverley",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/20328966?v=4",
+      "profile": "https://github.com/JonathanBeverley",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zend",
+      "name": "Zenghai Liang",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/25160?v=4",
+      "profile": "https://github.com/zend",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "matishadow",
+      "name": "Mateusz Tracz",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/9083085?v=4",
+      "profile": "https://about.me/matishadow",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pinpins",
+      "name": "pinpin",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/36234677?v=4",
+      "profile": "https://zergpool.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "TakuroOnoda",
+      "name": "Takuro Onoda",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1407926?v=4",
+      "profile": "https://github.com/TakuroOnoda",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "frauhottelmann",
+      "name": "frauhottelmann",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/902705?v=4",
+      "profile": "https://github.com/frauhottelmann",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
@@ -232,5 +350,6 @@
   "projectOwner": "Eugeny",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "commitConvention": "none"
+  "commitConvention": "none",
+  "skipCi": true
 }

.eslintrc.yml

@@ -29,7 +29,6 @@ rules:
   '@typescript-eslint/no-magic-numbers': off
   '@typescript-eslint/member-delimiter-style': off
   '@typescript-eslint/promise-function-async': off
-  '@typescript-eslint/no-unnecessary-type-assertion': off
   '@typescript-eslint/require-array-sort-compare': off
   '@typescript-eslint/no-floating-promises': off
   '@typescript-eslint/prefer-readonly': off
@@ -37,6 +36,7 @@ rules:
   '@typescript-eslint/strict-boolean-expressions': off
   '@typescript-eslint/no-misused-promises': off
   '@typescript-eslint/typedef': off
+  '@typescript-eslint/consistent-type-imports': off
   '@typescript-eslint/no-use-before-define':
   - error
   - classes: false
@@ -53,7 +53,8 @@ rules:
   computed-property-spacing:
   - error
   - never
-  comma-dangle:
+  comma-dangle: off
+  '@typescript-eslint/comma-dangle':
   - error
   - always-multiline
   curly: error
@@ -79,6 +80,7 @@ rules:
       args: after-used
       argsIgnorePattern: ^_
   no-undef: error
+  no-var: error
   object-curly-spacing:
   - error
   - always
@@ -92,9 +94,22 @@ rules:
   - error
   - single
   - allowTemplateLiterals: true
+  '@typescript-eslint/no-confusing-void-expression': off
   '@typescript-eslint/no-non-null-assertion': off
-  '@typescript-eslint/no-unnecessary-condition': off
+  '@typescript-eslint/no-unnecessary-condition':
-  '@typescript-eslint/no-untyped-public-signature': off # bugs out on constructors
+  - error
+  - allowConstantLoopConditions: true
   '@typescript-eslint/restrict-template-expressions': off
-  '@typescript-eslint/no-dynamic-delete': off
+  '@typescript-eslint/prefer-readonly-parameter-types': off
-  '@typescript-eslint/prefer-nullish-coalescing': off
+  '@typescript-eslint/no-unsafe-member-access': off
+  '@typescript-eslint/no-unsafe-call': off
+  '@typescript-eslint/no-unsafe-return': off
+  '@typescript-eslint/no-unsafe-assignment': off
+  '@typescript-eslint/naming-convention': off
+  '@typescript-eslint/lines-between-class-members':
+  - error
+  - exceptAfterSingleLine: true
+  '@typescript-eslint/dot-notation': off
+  '@typescript-eslint/no-implicit-any-catch': off
+  '@typescript-eslint/member-ordering': off
+  '@typescript-eslint/no-var-requires': off

.github/workflows/docs.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Installing Node
       uses: actions/setup-node@v1
       with:
-        version: 10
+        node-version: 10
 
     - name: Build
       run: |

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Installing Node
       uses: actions/setup-node@v1
       with:
-        version: 10
+        node-version: 15
 
     - name: Install deps
       run: |
@@ -22,5 +22,8 @@ jobs:
         rm app/node_modules/.yarn-integrity
         yarn
 
+    - name: Build typings
+      run: yarn run build:typings
+
     - name: Lint
       run: yarn run lint

.github/workflows/linux.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Install Node
       uses: actions/setup-node@v1
       with:
-        version: 10
+        node-version: 15
 
     - name: Install deps
       run: |
@@ -25,9 +25,6 @@ jobs:
     - name: Build native deps
       run: scripts/build-native.js
 
-    - name: Build typings
-      run: yarn run build:typings
-
     - name: Webpack
       run: yarn run build
 
@@ -39,6 +36,16 @@ jobs:
       env:
         DEBUG: electron-builder,electron-builder:*
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        USE_HARD_LINKS: false
+
+    - name: Upload symbols
+      run: |
+        sudo npm install -g @sentry/cli --unsafe-perm
+        ./scripts/sentry-upload.js
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 
     - name: Package artifacts
       run: |

.github/workflows/macos.yml

@@ -2,7 +2,12 @@ name: macOS Build
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: macos-11.0
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+          - arch: arm64
 
     steps:
     - name: Checkout
@@ -11,11 +16,11 @@ jobs:
     - name: Installing Node
       uses: actions/setup-node@v1
       with:
-        version: 10
+        node-version: 15
 
     - name: Install deps
       run: |
-        sudo npm i -g yarn@1.19.1
+        sudo npm i -g yarn@1.22.1
         cd app
         yarn
         cd ..
@@ -24,30 +29,47 @@ jobs:
 
     - name: Build native deps
       run: scripts/build-native.js
-
+      env:
-    - name: Build typings
+        ARCH: ${{matrix.arch}}
-      run: yarn run build:typings
 
     - name: Webpack
       run: yarn run build
 
     - name: Prepackage plugins
       run: scripts/prepackage-plugins.js
+      env:
+        ARCH: ${{matrix.arch}}
+
+    - run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
 
     - name: Build and sign packages
       run: scripts/build-macos.js
       if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
       env:
-        DEBUG: electron-builder,electron-builder:*
+        ARCH: ${{matrix.arch}}
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
         CSC_LINK: ${{ secrets.CSC_LINK }}
         CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+        APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
+        APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
+        USE_HARD_LINKS: false
+        # DEBUG: electron-builder,electron-builder:*
 
     - name: Build packages without signing
       run: scripts/build-macos.js
       if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
       env:
-        DEBUG: electron-builder,electron-builder:*
+        ARCH: ${{matrix.arch}}
+        # DEBUG: electron-builder,electron-builder:*
+
+    - name: Upload symbols
+      run: |
+        sudo npm install -g @sentry/cli --unsafe-perm
+        ./scripts/sentry-upload.js
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
 
     - name: Package artifacts
       run: |
@@ -59,11 +81,11 @@ jobs:
     - uses: actions/upload-artifact@master
       name: Upload PKG
       with:
-        name: macOS .pkg
+        name: macOS .pkg (${{matrix.arch}})
         path: artifact-pkg
 
     - uses: actions/upload-artifact@master
       name: Upload ZIP
       with:
-        name: macOS .zip
+        name: macOS .zip (${{matrix.arch}})
         path: artifact-zip

.github/workflows/windows.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Installing Node
       uses: actions/setup-node@v1
       with:
-        version: 10
+        node-version: 14
 
     - name: Build
       shell: powershell
@@ -34,12 +34,21 @@ jobs:
       run: node scripts/build-windows.js
       if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
 
+    - name: Upload symbols
+      run: |
+        npm install @sentry/cli
+        node scripts/sentry-upload.js
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+        SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+
     - name: Package artifacts
       run: |
         mkdir artifact-setup
         mv dist/*-setup.exe artifact-setup/
         mkdir artifact-portable
-        mv dist/*-portable.exe artifact-portable/
+        mv dist/*-portable.zip artifact-portable/
 
     - uses: actions/upload-artifact@master
       name: Upload installer

.gitignore

@@ -13,6 +13,9 @@ dist
 *.xcuserstate
 *.wixpdb
 
+.DS_Store
+.DS_Store?
+
 coverage
 .nyc_output
 npm-debug.log
@@ -28,3 +31,5 @@ docs/api
 .electron-symbols
 sentry.properties
 sentry-symbols.js
+
+terminus-ssh/util/pagent.exe

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-node_js: 11
+node_js: 15
 
 stages:
   - Build

README.md

@@ -1,24 +1,25 @@
-![](https://github.com/Eugeny/terminus/raw/master/docs/readme.png)
+****![](https://github.com/Eugeny/terminus/raw/master/docs/readme.png)
 
 
 <p align="center">
-  <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/eugeny/terminus.svg?label=License&style=flat-square"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/terminus.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a>
+  <a href="https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/eugeny/terminus.svg?label=License&style=flat-square"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus"><img alt="AppVeyor" src="https://img.shields.io/appveyor/ci/eugeny/****terminus****.svg?label=CI&logo=appveyor&logoColor=white&style=flat-square"></a>
 </p>
 
 <p align="center">
-  <a href="https://github.com/Eugeny/terminus/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/terminus/total.svg?label=DOWNLOAD&logo=github&style=for-the-badge"></a> <a href="https://ci.appveyor.com/project/Eugeny/terminus/build/artifacts"><img src="https://img.shields.io/badge/download-nightly%20build-magenta.svg?logo=appveyor&style=for-the-badge"/></a> <a href="https://gitter.im/terminus-terminal/community"><img alt="Gitter" src="https://img.shields.io/gitter/room/terminus/community.svg?color=blue&logo=gitter&style=for-the-badge"></a>
+  <a href="https://github.com/Eugeny/terminus/releases/latest"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/eugeny/terminus/total.svg?label=RELEASE&logo=github&style=for-the-badge"></a> <a href="https://nightly.link/Eugeny/terminus/workflows/windows/master"><img src="https://shields.io/badge/-Nightly-blue?logo=windows&style=for-the-badge"/></a> <a href="https://nightly.link/Eugeny/terminus/workflows/macos/master"><img src="https://shields.io/badge/-Nightly-black?logo=apple&style=for-the-badge"/></a> <a href="https://nightly.link/Eugeny/terminus/workflows/linux/master"><img src="https://shields.io/badge/-Nightly-orange?logo=linux&style=for-the-badge"/></a> <a href="https://gitter.im/terminus-terminal/community"><img alt="Gitter" src="https://img.shields.io/gitter/room/terminus/community.svg?color=magenta&logo=gitter&style=for-the-badge"></a>
 </p>
 
 ----
 
 **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)
@@ -34,12 +35,15 @@
 
 ---
 
+# Portable
+
+For portable in windows, user can create folder `data` at the same directory as `Terminal.exe` to save the settings.
+
 # Plugins
 
 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
@@ -66,42 +70,63 @@ See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) and
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="http://www.russellmyers.com"><img src="https://avatars2.githubusercontent.com/u/184085?v=4" width="100px;" alt="Russell Myers"/><br /><sub><b>Russell Myers</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mezner" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.russellmyers.com"><img src="https://avatars2.githubusercontent.com/u/184085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Russell Myers</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mezner" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.morwire.com"><img src="https://avatars1.githubusercontent.com/u/3991658?v=4" width="100px;" alt="Austin Warren"/><br /><sub><b>Austin Warren</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ehwarren" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.morwire.com"><img src="https://avatars1.githubusercontent.com/u/3991658?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Austin Warren</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ehwarren" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Drachenkaetzchen"><img src="https://avatars1.githubusercontent.com/u/162974?v=4" width="100px;" alt="Felicia Hummel"/><br /><sub><b>Felicia Hummel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Drachenkaetzchen" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Drachenkaetzchen"><img src="https://avatars1.githubusercontent.com/u/162974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Felicia Hummel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Drachenkaetzchen" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mikemaccana"><img src="https://avatars2.githubusercontent.com/u/172594?v=4" width="100px;" alt="Mike MacCana"/><br /><sub><b>Mike MacCana</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mikemaccana" title="Tests">⚠️</a> <a href="#design-mikemaccana" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/mikemaccana"><img src="https://avatars2.githubusercontent.com/u/172594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike MacCana</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mikemaccana" title="Tests">⚠️</a> <a href="#design-mikemaccana" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/yxuko"><img src="https://avatars1.githubusercontent.com/u/1786317?v=4" width="100px;" alt="Yacine Kanzari"/><br /><sub><b>Yacine Kanzari</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yxuko" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/yxuko"><img src="https://avatars1.githubusercontent.com/u/1786317?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yacine Kanzari</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yxuko" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/BBJip"><img src="https://avatars2.githubusercontent.com/u/32908927?v=4" width="100px;" alt="BBJip"/><br /><sub><b>BBJip</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=BBJip" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/BBJip"><img src="https://avatars2.githubusercontent.com/u/32908927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>BBJip</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=BBJip" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Futagirl"><img src="https://avatars2.githubusercontent.com/u/33533958?v=4" width="100px;" alt="Futagirl"/><br /><sub><b>Futagirl</b></sub></a><br /><a href="#design-Futagirl" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Futagirl"><img src="https://avatars2.githubusercontent.com/u/33533958?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Futagirl</b></sub></a><br /><a href="#design-Futagirl" title="Design">🎨</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://www.levrik.io"><img src="https://avatars3.githubusercontent.com/u/9491603?v=4" width="100px;" alt="Levin Rickert"/><br /><sub><b>Levin Rickert</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=levrik" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.levrik.io"><img src="https://avatars3.githubusercontent.com/u/9491603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Levin Rickert</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=levrik" title="Code">💻</a></td>
-    <td align="center"><a href="https://kwonoj.github.io"><img src="https://avatars2.githubusercontent.com/u/1210596?v=4" width="100px;" alt="OJ Kwon"/><br /><sub><b>OJ Kwon</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=kwonoj" title="Code">💻</a></td>
+    <td align="center"><a href="https://kwonoj.github.io"><img src="https://avatars2.githubusercontent.com/u/1210596?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OJ Kwon</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=kwonoj" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/Domain"><img src="https://avatars2.githubusercontent.com/u/903197?v=4" width="100px;" alt="domain"/><br /><sub><b>domain</b></sub></a><br /><a href="#plugin-Domain" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Domain" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Domain"><img src="https://avatars2.githubusercontent.com/u/903197?v=4?s=100" width="100px;" alt=""/><br /><sub><b>domain</b></sub></a><br /><a href="#plugin-Domain" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Domain" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.jbrumond.me"><img src="https://avatars1.githubusercontent.com/u/195127?v=4" width="100px;" alt="James Brumond"/><br /><sub><b>James Brumond</b></sub></a><br /><a href="#plugin-kbjr" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="http://www.jbrumond.me"><img src="https://avatars1.githubusercontent.com/u/195127?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Brumond</b></sub></a><br /><a href="#plugin-kbjr" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="http://www.growingwiththeweb.com"><img src="https://avatars0.githubusercontent.com/u/2193314?v=4" width="100px;" alt="Daniel Imms"/><br /><sub><b>Daniel Imms</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Code">💻</a> <a href="#plugin-Tyriar" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Tests">⚠️</a></td>
+    <td align="center"><a href="http://www.growingwiththeweb.com"><img src="https://avatars0.githubusercontent.com/u/2193314?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Imms</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Code">💻</a> <a href="#plugin-Tyriar" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/Eugeny/terminus/commits?author=Tyriar" title="Tests">⚠️</a></td>
-    <td align="center"><a href="https://github.com/baflo"><img src="https://avatars2.githubusercontent.com/u/834350?v=4" width="100px;" alt="Florian Bachmann"/><br /><sub><b>Florian Bachmann</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=baflo" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/baflo"><img src="https://avatars2.githubusercontent.com/u/834350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Florian Bachmann</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=baflo" title="Code">💻</a></td>
-    <td align="center"><a href="http://michael-kuehnel.de"><img src="https://avatars2.githubusercontent.com/u/441011?v=4" width="100px;" alt="Michael Kühnel"/><br /><sub><b>Michael Kühnel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mischah" title="Code">💻</a> <a href="#design-mischah" title="Design">🎨</a></td>
+    <td align="center"><a href="http://michael-kuehnel.de"><img src="https://avatars2.githubusercontent.com/u/441011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Kühnel</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=mischah" title="Code">💻</a> <a href="#design-mischah" title="Design">🎨</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/NieLeben"><img src="https://avatars3.githubusercontent.com/u/47182955?v=4" width="100px;" alt="Tilmann Meyer"/><br /><sub><b>Tilmann Meyer</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=NieLeben" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/NieLeben"><img src="https://avatars3.githubusercontent.com/u/47182955?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tilmann Meyer</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=NieLeben" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.jubeat.net"><img src="https://avatars3.githubusercontent.com/u/11289158?v=4" width="100px;" alt="PM Extra"/><br /><sub><b>PM Extra</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/issues?q=author%3APMExtra" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://www.jubeat.net"><img src="https://avatars3.githubusercontent.com/u/11289158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PM Extra</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/issues?q=author%3APMExtra" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4" width="100px;" alt="Jonathan"/><br /><sub><b>Jonathan</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=IgnusG" title="Code">💻</a></td>
+    <td align="center"><a href="https://jjuhas.keybase.pub//"><img src="https://avatars1.githubusercontent.com/u/6438760?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=IgnusG" title="Code">💻</a></td>
-    <td align="center"><a href="https://hans-koch.me"><img src="https://avatars0.githubusercontent.com/u/1093709?v=4" width="100px;" alt="Hans Koch"/><br /><sub><b>Hans Koch</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hammster" title="Code">💻</a></td>
+    <td align="center"><a href="https://hans-koch.me"><img src="https://avatars0.githubusercontent.com/u/1093709?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hans Koch</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hammster" title="Code">💻</a></td>
-    <td align="center"><a href="http://thepuzzlemaker.info"><img src="https://avatars3.githubusercontent.com/u/12666617?v=4" width="100px;" alt="Dak Smyth"/><br /><sub><b>Dak Smyth</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ThePuzzlemaker" title="Code">💻</a></td>
+    <td align="center"><a href="http://thepuzzlemaker.info"><img src="https://avatars3.githubusercontent.com/u/12666617?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dak Smyth</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=ThePuzzlemaker" title="Code">💻</a></td>
-    <td align="center"><a href="http://yfwz100.github.io"><img src="https://avatars2.githubusercontent.com/u/983211?v=4" width="100px;" alt="Wang Zhi"/><br /><sub><b>Wang Zhi</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yfwz100" title="Code">💻</a></td>
+    <td align="center"><a href="http://yfwz100.github.io"><img src="https://avatars2.githubusercontent.com/u/983211?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Zhi</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=yfwz100" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jack1142"><img src="https://avatars0.githubusercontent.com/u/6032823?v=4" width="100px;" alt="jack1142"/><br /><sub><b>jack1142</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=jack1142" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jack1142"><img src="https://avatars0.githubusercontent.com/u/6032823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jack1142</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=jack1142" title="Code">💻</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/hdougie"><img src="https://avatars1.githubusercontent.com/u/450799?v=4" width="100px;" alt="Howie Douglas"/><br /><sub><b>Howie Douglas</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hdougie" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/hdougie"><img src="https://avatars1.githubusercontent.com/u/450799?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Howie Douglas</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=hdougie" title="Code">💻</a></td>
-    <td align="center"><a href="https://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4" width="100px;" alt="Chris Kaczor"/><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://chriskaczor.com"><img src="https://avatars2.githubusercontent.com/u/180906?v=4?s=100" 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="Johannes Kadak"/><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://www.boxmein.net"><img src="https://avatars1.githubusercontent.com/u/358714?v=4?s=100" 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?s=100" 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?s=100" 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>
+    <td align="center"><a href="https://github.com/nstefanou"><img src="https://avatars3.githubusercontent.com/u/51129173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nstefanou</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=nstefanou" title="Code">💻</a> <a href="#plugin-nstefanou" title="Plugin/utility libraries">🔌</a></td>
+    <td align="center"><a href="https://github.com/orin220444"><img src="https://avatars3.githubusercontent.com/u/30747229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orin220444</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=orin220444" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Goobles"><img src="https://avatars3.githubusercontent.com/u/8776771?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gobius Dolhain</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=Goobles" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/3l0w"><img src="https://avatars2.githubusercontent.com/u/37798980?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gwilherm Folliot</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=3l0w" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Dimitory"><img src="https://avatars0.githubusercontent.com/u/475955?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dmitry Pronin</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=dimitory" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/JonathanBeverley"><img src="https://avatars1.githubusercontent.com/u/20328966?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan Beverley</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=JonathanBeverley" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/zend"><img src="https://avatars1.githubusercontent.com/u/25160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zenghai Liang</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=zend" title="Code">💻</a></td>
+    <td align="center"><a href="https://about.me/matishadow"><img src="https://avatars0.githubusercontent.com/u/9083085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Tracz</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=matishadow" title="Code">💻</a></td>
+    <td align="center"><a href="https://zergpool.com"><img src="https://avatars3.githubusercontent.com/u/36234677?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pinpin</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=pinpins" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/TakuroOnoda"><img src="https://avatars0.githubusercontent.com/u/1407926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Takuro Onoda</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=TakuroOnoda" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/frauhottelmann"><img src="https://avatars2.githubusercontent.com/u/902705?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frauhottelmann</b></sub></a><br /><a href="https://github.com/Eugeny/terminus/commits?author=frauhottelmann" title="Code">💻</a></td>
   </tr>
 </table>
 
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

app/index.pug

@@ -8,17 +8,15 @@ html
             window.nodeRequire = require
         script(src='./preload.js')
         script(src='./bundle.js', defer)
-        style#custom-css
         style.
             body { transition: 0.5s background; }
     body
+        style#custom-css
         app-root
             .preload-logo
                 div
                     .terminus-logo
                     h1.terminus-title Terminus
-                        sup α 
+                        sup α
                     .progress
                         .bar(style='width: 0%')
-
-                    

app/lib/app.ts

@@ -1,37 +1,61 @@
-import { app, ipcMain, Menu, Tray, shell } from 'electron'
+import { app, ipcMain, Menu, Tray, shell, screen, globalShortcut, MenuItemConstructorOptions } from 'electron'
-import * as electron from 'electron'
+import * as promiseIpc from 'electron-promise-ipc'
 import { loadConfig } from './config'
 import { Window, WindowOptions } from './window'
+import { pluginManager } from './pluginManager'
 
 export class Application {
-    private tray: Tray
+    private tray?: Tray
     private windows: Window[] = []
 
     constructor () {
-        ipcMain.on('app:config-change', () => {
+        ipcMain.on('app:config-change', (_event, config) => {
-            this.broadcast('host:config-change')
+            this.broadcast('host:config-change', config)
+        })
+
+        ipcMain.on('app:register-global-hotkey', (_event, specs) => {
+            globalShortcut.unregisterAll()
+            for (const spec of specs) {
+                globalShortcut.register(spec, () => {
+                    this.onGlobalHotkey()
+                })
+            }
+        })
+
+        ;(promiseIpc as any).on('plugin-manager:install', (path, name, version) => {
+            return pluginManager.install(path, name, version)
+        })
+
+        ;(promiseIpc as any).on('plugin-manager:uninstall', (path, name) => {
+            return pluginManager.uninstall(path, name)
         })
 
         const configData = loadConfig()
-        if (process.platform === 'linux' && ((configData.appearance || {}).opacity || 1) !== 1) {
+        if (process.platform === 'linux') {
-            app.commandLine.appendSwitch('enable-transparent-visuals')
+            app.commandLine.appendSwitch('no-sandbox')
-            app.disableHardwareAcceleration()
+            if (((configData.appearance || {}).opacity || 1) !== 1) {
+                app.commandLine.appendSwitch('enable-transparent-visuals')
+                app.disableHardwareAcceleration()
+            }
         }
 
         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])
         }
     }
 
-    init () {
+    init (): void {
-        electron.screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))
+        screen.on('display-metrics-changed', () => this.broadcast('host:display-metrics-changed'))
+        screen.on('display-added', () => this.broadcast('host:displays-changed'))
+        screen.on('display-removed', () => this.broadcast('host:displays-changed'))
     }
 
     async newWindow (options?: WindowOptions): Promise<Window> {
-        let window = new Window(options)
+        const window = new Window(options)
         this.windows.push(window)
         window.visible$.subscribe(visible => {
             if (visible) {
@@ -40,6 +64,9 @@ export class Application {
                 this.enableTray()
             }
         })
+        window.closed$.subscribe(() => {
+            this.windows = this.windows.filter(x => x !== window)
+        })
         if (process.platform === 'darwin') {
             this.setupMenu()
         }
@@ -47,20 +74,38 @@ export class Application {
         return window
     }
 
-    broadcast (event, ...args) {
+    onGlobalHotkey (): void {
-        for (let window of this.windows) {
+        if (this.windows.some(x => x.isFocused())) {
+            for (const window of this.windows) {
+                window.hide()
+            }
+        } else {
+            for (const window of this.windows) {
+                window.present()
+            }
+        }
+    }
+
+    presentAllWindows (): void {
+        for (const window of this.windows) {
+            window.present()
+        }
+    }
+
+    broadcast (event: string, ...args: any[]): void {
+        for (const window of this.windows) {
             window.send(event, ...args)
         }
     }
 
-    async send (event, ...args) {
+    async send (event: string, ...args: any[]): Promise<void> {
         if (!this.hasWindows()) {
             await this.newWindow()
         }
         this.windows.filter(w => !w.isDestroyed())[0].send(event, ...args)
     }
 
-    enableTray () {
+    enableTray (): void {
         if (this.tray) {
             return
         }
@@ -71,7 +116,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',
@@ -85,25 +130,28 @@ export class Application {
         this.tray.setToolTip(`Terminus ${app.getVersion()}`)
     }
 
-    disableTray () {
+    disableTray (): void {
-        if (this.tray) {
+        this.tray?.destroy()
-            this.tray.destroy()
+        this.tray = null
-            this.tray = null
-        }
     }
 
-    hasWindows () {
+    hasWindows (): boolean {
         return !!this.windows.length
     }
 
-    focus () {
+    focus (): void {
-        for (let window of this.windows) {
+        for (const window of this.windows) {
             window.show()
         }
     }
 
+    handleSecondInstance (argv: string[], cwd: string): void {
+        this.presentAllWindows()
+        this.windows[this.windows.length - 1].handleSecondInstance(argv, cwd)
+    }
+
     private setupMenu () {
-        let template: Electron.MenuItemConstructorOptions[] = [
+        const template: MenuItemConstructorOptions[] = [
             {
                 label: 'Application',
                 submenu: [
@@ -182,7 +230,7 @@ export class Application {
                         },
                     },
                 ],
-            }
+            },
         ]
 
         Menu.setApplicationMenu(Menu.buildFromTemplate(template))

app/lib/cli.ts

@@ -1,11 +1,11 @@
 import { app } from 'electron'
 
-export function parseArgs (argv, cwd) {
+export function parseArgs (argv: string[], cwd: string): any {
     if (argv[0].includes('node')) {
         argv = argv.slice(1)
     }
 
-    return require('yargs')
+    return require('yargs/yargs')(argv.slice(1))
         .usage('terminus [command] [arguments]')
         .command('open [directory]', 'open a shell in a directory', {
             directory: { type: 'string', 'default': cwd },
@@ -20,26 +20,26 @@ 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))
+        .parse()
 }

app/lib/config.ts

@@ -4,7 +4,7 @@ import * as yaml from 'js-yaml'
 import { app } from 'electron'
 
 export function loadConfig (): any {
-    let configPath = path.join(app.getPath('userData'), 'config.yaml')
+    const configPath = path.join(app.getPath('userData'), 'config.yaml')
     if (fs.existsSync(configPath)) {
         return yaml.safeLoad(fs.readFileSync(configPath, 'utf8'))
     } else {

app/lib/index.ts

@@ -1,3 +1,5 @@
+import './portable'
+import 'source-map-support/register'
 import './sentry'
 import './lru'
 import { app, ipcMain, Menu } from 'electron'
@@ -33,7 +35,7 @@ process.on('uncaughtException' as any, err => {
 })
 
 app.on('second-instance', (_event, argv, cwd) => {
-    application.send('host:second-instance', parseArgs(argv, cwd), cwd)
+    application.handleSecondInstance(argv, cwd)
 })
 
 const argv = parseArgs(process.argv, process.cwd())
@@ -58,8 +60,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 })
+import * as LRU from 'lru-cache'
-
+import * as fs from 'fs'
-let fs = require('fs')
+const lru = new LRU({ max: 256, maxAge: 250 })
-let origLstat = fs.realpathSync.bind(fs)
+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/pluginManager.ts

@@ -0,0 +1,40 @@
+import { promisify } from 'util'
+
+
+export class PluginManager {
+    npm: any
+    npmReady?: Promise<void>
+
+    async ensureLoaded (): Promise<void> {
+        if (!this.npmReady) {
+            this.npmReady = new Promise(resolve => {
+                const npm = require('npm')
+                npm.load(err => {
+                    if (err) {
+                        console.error(err)
+                        return
+                    }
+                    npm.config.set('global', false)
+                    this.npm = npm
+                    resolve()
+                })
+            })
+        }
+        return this.npmReady
+    }
+
+    async install (path: string, name: string, version: string): Promise<void> {
+        await this.ensureLoaded()
+        this.npm.prefix = path
+        return promisify(this.npm.commands.install)([`${name}@${version}`])
+    }
+
+    async uninstall (path: string, name: string): Promise<void> {
+        await this.ensureLoaded()
+        this.npm.prefix = path
+        return promisify(this.npm.commands.remove)([name])
+    }
+}
+
+
+export const pluginManager = new PluginManager()

app/lib/portable.ts

@@ -0,0 +1,22 @@
+import * as path from 'path'
+import * as fs from 'fs'
+
+let appPath: string | null = null
+try {
+    appPath = path.dirname(require('electron').app.getPath('exe'))
+} catch {
+    appPath = path.dirname(require('electron').remote.app.getPath('exe'))
+}
+
+if (fs.existsSync(path.join(appPath, 'terminus-data'))) {
+    fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
+}
+const portableData = path.join(appPath, 'data')
+if (fs.existsSync(portableData)) {
+    console.log('reset user data to ' + portableData)
+    try {
+        require('electron').app.setPath('userData', portableData)
+    } catch {
+        require('electron').remote.app.setPath('userData', portableData)
+    }
+}

app/lib/sentry.ts

@@ -1,18 +1,21 @@
-const { init } = process.type === 'main' ? require('@sentry/electron/dist/main') : require('@sentry/electron/dist/renderer')
+const { init } = String(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'
-let release
+let release = null
 try {
     release = require('electron').app.getVersion()
 } catch {
     release = require('electron').remote.app.getVersion()
 }
 
-init({
+if (!isDev) {
-    dsn: SENTRY_DSN,
+    init({
-    release,
+        dsn: SENTRY_DSN,
-    integrations (integrations) {
+        release,
-        return integrations.filter(integration => integration.name !== 'Breadcrumbs')
+        integrations (integrations) {
-    },
+            return integrations.filter(integration => integration.name !== 'Breadcrumbs')
-})
+        },
+    })
+}

app/lib/window.ts

@@ -1,18 +1,19 @@
+import * as glasstron from 'glasstron'
+
 import { Subject, Observable } from 'rxjs'
 import { debounceTime } from 'rxjs/operators'
-import { BrowserWindow, app, ipcMain, Rectangle, screen } from 'electron'
+import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions } from 'electron'
 import ElectronConfig = require('electron-config')
 import * as os from 'os'
 import * as path from 'path'
+import macOSRelease from 'macos-release'
+import * as compareVersions from 'compare-versions'
 
+import { parseArgs } from './cli'
 import { loadConfig } from './config'
 
-let SetWindowCompositionAttribute: any
+let DwmEnableBlurBehindWindow: any = null
-let AccentState: any
-let DwmEnableBlurBehindWindow: any
 if (process.platform === 'win32') {
-    SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute
-    AccentState = require('windows-swca').ACCENT_STATE
     DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
@@ -20,26 +21,38 @@ export interface WindowOptions {
     hidden?: boolean
 }
 
+abstract class GlasstronWindow extends BrowserWindow {
+    blurType: string
+    abstract setBlur (_: boolean)
+}
+
+const macOSVibrancyType = process.platform === 'darwin' ? compareVersions.compare(macOSRelease().version, '10.14', '>=') ? 'fullscreen-ui' : 'dark' : null
+
 export class Window {
     ready: Promise<void>
     private visible = new Subject<boolean>()
-    private window: BrowserWindow
+    private closed = new Subject<void>()
+    private window?: GlasstronWindow
     private windowConfig: ElectronConfig
-    private windowBounds: Rectangle
+    private windowBounds?: Rectangle
     private closing = false
+    private lastVibrancy: {enabled: boolean, type?: string} | null = null
+    private disableVibrancyWhileDragging = false
+    private configStore: any
 
     get visible$ (): Observable<boolean> { return this.visible }
+    get closed$ (): Observable<void> { return this.closed }
 
     constructor (options?: WindowOptions) {
-        let configData = loadConfig()
+        this.configStore = loadConfig()
 
-        options = options || {}
+        options = options ?? {}
 
         this.windowConfig = new ElectronConfig({ name: 'window' })
         this.windowBounds = this.windowConfig.get('windowBoundaries')
 
-        let maximized = this.windowConfig.get('maximized')
+        const maximized = this.windowConfig.get('maximized')
-        let bwOptions: Electron.BrowserWindowConstructorOptions = {
+        const bwOptions: BrowserWindowConstructorOptions = {
             width: 800,
             height: 600,
             title: 'Terminus',
@@ -48,6 +61,9 @@ export class Window {
             webPreferences: {
                 nodeIntegration: true,
                 preload: path.join(__dirname, 'sentry.js'),
+                backgroundThrottling: false,
+                enableRemoteModule: true,
+                contextIsolation: false,
             },
             frame: false,
             show: false,
@@ -56,18 +72,18 @@ 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 [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 [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.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2
-                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2;
+                bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2
             }
         }
 
-        if ((configData.appearance || {}).frame === 'native') {
+        if ((this.configStore.appearance || {}).frame === 'native') {
             bwOptions.frame = true
         } else {
             if (process.platform === 'darwin') {
@@ -75,15 +91,16 @@ export class Window {
             }
         }
 
-        if (process.platform === 'linux') {
+        if (process.platform === 'darwin') {
-            bwOptions.backgroundColor = '#131d27'
+            this.window = new BrowserWindow(bwOptions) as GlasstronWindow
+        } else {
+            this.window = new glasstron.BrowserWindow(bwOptions)
         }
 
-        this.window = new BrowserWindow(bwOptions)
         this.window.once('ready-to-show', () => {
             if (process.platform === 'darwin') {
-                this.window.setVibrancy('window')
+                this.window.setVibrancy(macOSVibrancyType)
-            } else if (process.platform === 'win32' && (configData.appearance || {}).vibrancy) {
+            } else if (process.platform === 'win32' && (this.configStore.appearance || {}).vibrancy) {
                 this.setVibrancy(true)
             }
 
@@ -94,6 +111,13 @@ export class Window {
                     this.window.show()
                 }
                 this.window.focus()
+                this.window.moveTop()
+            }
+        })
+
+        this.window.on('blur', () => {
+            if (this.configStore.appearance?.dockHideOnBlur) {
+                this.hide()
             }
         })
 
@@ -116,41 +140,93 @@ export class Window {
         })
     }
 
-    setVibrancy (enabled: boolean, type?: string) {
+    setVibrancy (enabled: boolean, type?: string, userRequested?: boolean): void {
+        if (userRequested ?? true) {
+            this.lastVibrancy = { enabled, type }
+        }
         if (process.platform === 'win32') {
             if (parseFloat(os.release()) >= 10) {
-                let attribValue = AccentState.ACCENT_DISABLED
+                this.window.blurType = enabled ? type === 'fluent' ? 'acrylic' : 'blurbehind' : null
-                if (enabled) {
+                try {
-                    if (parseInt(os.release().split('.')[2]) >= 17063 && type === 'fluent') {
+                    this.window.setBlur(enabled)
-                        attribValue = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND
+                } catch (error) {
-                    } else {
+                    console.error('Failed to set window blur', error)
-                        attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
-                    }
                 }
-                SetWindowCompositionAttribute(this.window.getNativeWindowHandle(), attribValue, 0x00000000)
             } else {
                 DwmEnableBlurBehindWindow(this.window, enabled)
             }
+        } else if (process.platform === 'linux') {
+            this.window.setBackgroundColor(enabled ? '#00000000' : '#131d27')
+            this.window.setBlur(enabled)
+        } else {
+            this.window.setVibrancy(enabled ? macOSVibrancyType : null)
         }
     }
 
-    show () {
+    show (): void {
         this.window.show()
+        this.window.moveTop()
     }
 
-    focus () {
+    focus (): void {
         this.window.focus()
     }
 
-    send (event, ...args) {
+    send (event: string, ...args: any[]): void {
         if (!this.window) {
             return
         }
         this.window.webContents.send(event, ...args)
+        if (event === 'host:config-change') {
+            this.configStore = args[0]
+        }
     }
 
-    isDestroyed () {
+    isDestroyed (): boolean {
-        return !this.window || this.window.isDestroyed();
+        return !this.window || this.window.isDestroyed()
+    }
+
+    isFocused (): boolean {
+        return this.window.isFocused()
+    }
+
+    hide (): void {
+        if (process.platform === 'darwin') {
+            // Lose focus
+            Menu.sendActionToFirstResponder('hide:')
+        }
+        this.window.blur()
+        if (process.platform !== 'darwin') {
+            this.window.hide()
+        }
+    }
+
+    present (): void {
+        if (!this.window.isVisible()) {
+            // unfocused, invisible
+            this.window.show()
+            this.window.focus()
+        } else {
+            if (!this.configStore.appearance?.dock || this.configStore.appearance?.dock === 'off') {
+                // not docked, visible
+                setTimeout(() => {
+                    this.window.show()
+                    this.window.focus()
+                })
+            } else {
+                if (this.configStore.appearance?.dockAlwaysOnTop) {
+                    // docked, visible, on top
+                    this.window.hide()
+                } else {
+                    // docked, visible, not on top
+                    this.window.focus()
+                }
+            }
+        }
+    }
+
+    handleSecondInstance (argv: string[], cwd: string): void {
+        this.send('host:second-instance', parseArgs(argv, cwd), cwd)
     }
 
     private setupWindowManagement () {
@@ -163,7 +239,7 @@ export class Window {
             this.visible.next(false)
         })
 
-        let moveSubscription = new Observable<void>(observer => {
+        const moveSubscription = new Observable<void>(observer => {
             this.window.on('move', () => observer.next())
         }).pipe(debounceTime(250)).subscribe(() => {
             this.send('host:window-moved')
@@ -202,6 +278,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,10 +369,32 @@ 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
+        })
+
+        let moveEndedTimeout: number|null = null
+        const onBoundsChange = () => {
+            if (!this.lastVibrancy?.enabled || !this.disableVibrancyWhileDragging) {
+                return
+            }
+            this.setVibrancy(false, undefined, false)
+            if (moveEndedTimeout) {
+                clearTimeout(moveEndedTimeout)
+            }
+            moveEndedTimeout = setTimeout(() => {
+                this.setVibrancy(this.lastVibrancy.enabled, this.lastVibrancy.type)
+            }, 50)
+        }
+        this.window.on('move', onBoundsChange)
+        this.window.on('resize', onBoundsChange)
     }
 
     private destroy () {
         this.window = null
+        this.closed.next()
         this.visible.complete()
+        this.closed.complete()
     }
 }

app/package.json

@@ -13,42 +13,51 @@
     "watch": "webpack --progress --color --watch"
   },
   "dependencies": {
-    "@angular/animations": "7.2.8",
+    "@angular/animations": "^9.1.9",
-    "@angular/common": "7.2.8",
+    "@angular/common": "^9.1.11",
-    "@angular/compiler": "7.2.8",
+    "@angular/compiler": "^9.1.9",
-    "@angular/core": "7.2.8",
+    "@angular/core": "^9.1.9",
-    "@angular/forms": "7.2.8",
+    "@angular/forms": "^9.1.11",
-    "@angular/platform-browser": "7.2.8",
+    "@angular/platform-browser": "^9.1.9",
-    "@angular/platform-browser-dynamic": "7.2.8",
+    "@angular/platform-browser-dynamic": "^9.1.9",
-    "@ng-bootstrap/ng-bootstrap": "^4.2.2",
+    "@ng-bootstrap/ng-bootstrap": "^6.1.0",
-    "devtron": "1.4.0",
+    "@terminus-term/node-pty": "0.10.0-beta11",
     "electron-config": "2.0.0",
     "electron-debug": "^3.0.1",
     "electron-is-dev": "1.1.0",
-    "electron-updater": "^4.2.0",
+    "electron-promise-ipc": "^2.2.4",
-    "fontmanager-redux": "0.4.0",
+    "fontmanager-redux": "1.0.0",
-    "js-yaml": "3.13.1",
+    "glasstron": "0.0.6",
-    "keytar": "^5.0.0",
+    "js-yaml": "3.14.0",
+    "keytar": "^7.2.0",
     "mz": "^2.7.0",
-    "ngx-toastr": "^10.2.0",
+    "ngx-toastr": "^12.0.1",
-    "node-pty": "^0.10.0-beta2",
+    "npm": "6",
-    "npm": "6.9.0",
     "path": "0.12.7",
-    "rxjs": "^6.5.3",
+    "rxjs": "^6.5.5",
-    "rxjs-compat": "^6.5.3",
+    "yargs": "^15.4.1",
-    "yargs": "^15.0.2",
+    "zone.js": "^0.11.3"
-    "zone.js": "^0.8.29"
   },
   "optionalDependencies": {
-    "macos-native-processlist": "^1.0.2",
+    "macos-native-processlist": "^2.0.0",
+    "serialport": "^9.0.4",
     "windows-blurbehind": "^1.0.1",
-    "windows-native-registry": "^1.0.16",
+    "windows-native-registry": "^3.0.0",
-    "windows-process-tree": "^0.2.4",
+    "windows-process-tree": "^0.2.4"
-    "windows-swca": "^2.0.2"
   },
   "devDependencies": {
     "@types/mz": "0.0.32",
-    "@types/node": "12.7.12",
+    "@types/node": "14.14.14",
-    "node-abi": "^2.13.0"
+    "node-abi": "2.19.3",
+    "source-map-support": "^0.5.19"
+  },
+  "peerDependencies": {
+    "terminus-community-color-schemes": "*",
+    "terminus-core": "*",
+    "terminus-plugin-manager": "*",
+    "terminus-serial": "*",
+    "terminus-settings": "*",
+    "terminus-ssh": "*",
+    "terminus-terminal": "*"
   }
 }

app/src/app.module.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
@@ -7,7 +8,7 @@ export function getRootModule (plugins: any[]) {
     const imports = [
         BrowserModule,
         ...plugins,
-        NgbModule.forRoot(),
+        NgbModule,
         ToastrModule.forRoot({
             positionClass: 'toast-bottom-center',
             toastClass: 'toast',

app/src/entry.preload.ts

@@ -3,6 +3,7 @@ import 'source-sans-pro/source-sans-pro.css'
 import 'source-code-pro/source-code-pro.css'
 import '@fortawesome/fontawesome-free/css/solid.css'
 import '@fortawesome/fontawesome-free/css/brands.css'
+import '@fortawesome/fontawesome-free/css/regular.css'
 import '@fortawesome/fontawesome-free/css/fontawesome.css'
 import 'ngx-toastr/toastr.css'
 import './preload.scss'

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 => {
@@ -50,8 +58,8 @@ findPlugins().then(async plugins => {
         window['safeModeReason'] = error
         try {
             await bootstrap(plugins, true)
-        } catch (error) {
+        } catch (error2) {
-            console.error('Bootstrap failed:', error)
+            console.error('Bootstrap failed:', error2)
         }
     }
 })

app/src/plugins.ts

@@ -3,13 +3,13 @@ import * as path from 'path'
 const nodeModule = require('module') // eslint-disable-line @typescript-eslint/no-var-requires
 const nodeRequire = (global as any).require
 
-function normalizePath (path: string): string {
+function normalizePath (p: string): string {
     const cygwinPrefix = '/cygdrive/'
-    if (path.startsWith(cygwinPrefix)) {
+    if (p.startsWith(cygwinPrefix)) {
-        path = path.substring(cygwinPrefix.length).replace('/', '\\')
+        p = p.substring(cygwinPrefix.length).replace('/', '\\')
-        path = path[0] + ':' + path.substring(1)
+        p = p[0] + ':' + p.substring(1)
     }
-    return path
+    return p
 }
 
 global['module'].paths.map((x: string) => nodeModule.globalPaths.push(normalizePath(x)))
@@ -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'),
+    require('electron').remote.app.getPath('userData'),
-    'terminus',
     'plugins',
 )
 
@@ -64,7 +63,6 @@ const builtinModules = [
     'ngx-toastr',
     'rxjs',
     'rxjs/operators',
-    'rxjs-compat/Subject',
     'terminus-core',
     'terminus-settings',
     'terminus-terminal',
@@ -84,7 +82,7 @@ const originalRequire = (global as any).require
     if (cachedBuiltinModules[query]) {
         return cachedBuiltinModules[query]
     }
-    return originalRequire.apply(this, arguments)
+    return originalRequire.apply(this, [query])
 }
 
 const originalModuleRequire = nodeModule.prototype.require
@@ -174,8 +172,8 @@ export async function loadPlugins (foundPlugins: PluginInfo[], progress: Progres
             console.time(label)
             const packageModule = nodeRequire(foundPlugin.path)
             const pluginModule = packageModule.default.forRoot ? packageModule.default.forRoot() : packageModule.default
-            pluginModule['pluginName'] = foundPlugin.name
+            pluginModule.pluginName = foundPlugin.name
-            pluginModule['bootstrap'] = packageModule.bootstrap
+            pluginModule.bootstrap = packageModule.bootstrap
             plugins.push(pluginModule)
             console.timeEnd(label)
             await new Promise(x => setTimeout(x, 50))

app/src/toastr.scss

@@ -9,6 +9,7 @@
     padding: 10px;
     background-image: none;
     width: auto;
+    flex-basis: auto;
 
     &.toast-error {
       background-color: #BD362F;

app/tsconfig.main.json

@@ -12,7 +12,6 @@
         "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
-        "noUnusedParameters": true,
         "noUnusedLocals": true,
         "lib": [
            "dom",

app/webpack.main.config.js

@@ -35,11 +35,15 @@ module.exports = {
   externals: {
     electron: 'commonjs electron',
     'electron-config': 'commonjs electron-config',
+    'electron-promise-ipc': 'commonjs electron-promise-ipc',
     'electron-vibrancy': 'commonjs electron-vibrancy',
     fs: 'commonjs fs',
+    glasstron: 'commonjs glasstron',
     mz: 'commonjs mz',
+    npm: 'commonjs npm',
     path: 'commonjs path',
-    yargs: 'commonjs yargs',
+    util: 'commonjs util',
+    'source-map-support': 'commonjs source-map-support',
     'windows-swca': 'commonjs windows-swca',
     'windows-blurbehind': 'commonjs windows-blurbehind',
   },
@@ -49,4 +53,6 @@ module.exports = {
       'process.type': '"main"',
     }),
   ],
+  // Ignore warnings due to yarg's dynamic module loading
+  ignoreWarnings: [/node_modules\/yargs/],
 }

appveyor.yml

@@ -4,7 +4,7 @@ platform:
   - x64
 
 environment:
-  nodejs_version: "10"
+  nodejs_version: "15"
 
 version: "{build}"
 

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
+chmod +x '/usr/bin/${executable}'
-ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'

build/mac/afterBuildHook.js

@@ -0,0 +1,16 @@
+const fs = require('fs')
+const signHook = require('./afterSignHook')
+
+module.exports = async function (params) {
+    // notarize the app on Mac OS only.
+    if (process.platform !== 'darwin' || !process.env.GITHUB_REF || !process.env.GITHUB_REF.startsWith('refs/tags/')) {
+        return
+    }
+    console.log('afterBuild hook triggered')
+
+    let pkgName = fs.readdirSync('dist').find(x => x.endsWith('.pkg'))
+    signHook({
+        appOutDir: 'dist',
+        _pathOverride: pkgName,
+    })
+}

build/mac/afterSignHook.js

@@ -6,14 +6,14 @@ const notarizer = require('electron-notarize')
 
 module.exports = async function (params) {
     // notarize the app on Mac OS only.
-    if (process.platform !== 'darwin' || process.env.GITHUB_REF !== 'refs/heads/master' || process.env.GITHUB_REF && !process.env.GITHUB_REF.startsWith('refs/tags/')) {
+    if (process.platform !== 'darwin' || !process.env.GITHUB_REF || !process.env.GITHUB_REF.startsWith('refs/tags/')) {
         return
     }
     console.log('afterSign hook triggered', params)
 
     let appId = 'org.terminus'
 
-    let appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`)
+    let appPath = path.join(params.appOutDir, params._pathOverride || `${params.packager.appInfo.productFilename}.app`)
     if (!fs.existsSync(appPath)) {
         throw new Error(`Cannot find application at: ${appPath}`)
     }

build/mac/entitlements.plist

@@ -10,5 +10,9 @@
     <true/>
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
+    <key>com.apple.security.device.microphone</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
   </dict>
 </plist>

electron-builder.yml

@@ -0,0 +1,89 @@
+---
+appId: org.terminus
+productName: Terminus
+compression: normal
+npmRebuild: false
+afterSign: "./build/mac/afterSignHook.js"
+afterAllArtifactBuild: "./build/mac/afterBuildHook.js"
+files:
+- '**/*'
+- dist
+- '!src'
+- '!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}'
+- '!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples,docs}'
+- '!**/node_modules/@angular/common/locales'
+- '!**/node_modules/@angular/compiler/src'
+- '!**/node_modules/node-gyp'
+- '!**/node_modules/**/*.d.ts'
+- '!**/node_modules/**/*.map'
+- '!**/node_modules/**/include/node'
+- '!**/node_modules/.bin'
+- '!**/node_modules/*/*/{esm5,fesm5,esm2015,fesm2015,_esm2015,_fesm2015}'
+- '!**/*.{woff,ttf,otf,eot}'
+- '!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}'
+- '!.editorconfig'
+- '!**/._*'
+- '!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,.gitignore,.gitattributes}'
+- '!**/{__pycache__,thumbs.db,.flowconfig,.idea,.vs,.nyc_output}'
+- '!**/{appveyor.yml,.travis.yml,circle.yml}'
+- '!**/{npm-debug.log,yarn.lock,.yarn-integrity,.yarn-metadata.json'
+extraResources:
+- builtin-plugins
+- extras
+publish:
+- provider: github
+
+win:
+  icon: "./build/windows/icon.ico"
+  artifactName: terminus-${version}-portable.${ext}
+  rfc3161TimeStampServer: http://sha256timestamp.ws.symantec.com/sha256/timestamp
+nsis:
+  oneClick: false
+  artifactName: terminus-${version}-setup.${ext}
+  installerIcon: "./build/windows/icon.ico"
+  allowToChangeInstallationDirectory: true
+
+mac:
+  category: public.app-category.video
+  icon: "./build/mac/icon.icns"
+  artifactName: terminus-${version}-macos-${env.ARCH}.${ext}
+  hardenedRuntime: true
+  entitlements: "./build/mac/entitlements.plist"
+  entitlementsInherit: "./build/mac/entitlements.plist"
+  extendInfo:
+    NSRequiresAquaSystemAppearance: false
+    NSCameraUsageDescription: "A subprocess requests access to the device's camera."
+    NSMicrophoneUsageDescription: "A subprocess requests access to the device's microphone."
+    NSLocationUsageDescription: "A subprocess requests access to the user's location information."
+    NSDesktopFolderUsageDescription: "A subprocess requests access to the user's Desktop folder."
+    NSDocumentsFolderUsageDescription: "A subprocess requests access to the user's Documents folder."
+    NSDownloadsFolderUsageDescription: "A subprocess requests access to the user's Downloads folder."
+    NSNetworkVolumesUsageDescription: 'A subprocess requests access to files on a network volume.'
+    NSRemovableVolumesUsageDescription: 'A subprocess requests access to files on a removable volume.'
+
+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
+  - gnome-keyring
+  - libnotify4
+  - libsecret-1-0
+  - libappindicator1
+  - libxtst6
+  - libnss3
+  afterInstall: build/linux/after-install.tpl
+rpm:
+  depends:
+  - screen
+  - gnome-keyring

package.json

@@ -1,140 +1,80 @@
 {
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.11.2",
+    "@fortawesome/fontawesome-free": "^5.13.0",
-    "@sentry/cli": "^1.49.0",
+    "@sentry/cli": "^1.61.0",
-    "@sentry/electron": "^1.0.0",
+    "@sentry/electron": "^2.0.4",
     "@types/electron-config": "^3.2.2",
     "@types/electron-debug": "^2.1.0",
-    "@types/js-yaml": "^3.12.1",
+    "@types/fs-extra": "^8.1.1",
-    "@types/node": "12.7.12",
+    "@types/js-yaml": "^3.12.5",
-    "@types/webpack-env": "1.14.1",
+    "@types/node": "14.14.14",
-    "@typescript-eslint/eslint-plugin": "^2.9.0",
+    "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/parser": "^2.10.0",
+    "@typescript-eslint/eslint-plugin": "^4.11.0",
+    "@typescript-eslint/parser": "^4.11.0",
     "apply-loader": "2.0.0",
-    "awesome-typescript-loader": "^5.0.0",
+    "awesome-typescript-loader": "^5.2.1",
-    "core-js": "^3.4.2",
+    "compare-versions": "^3.6.0",
-    "cross-env": "6.0.3",
+    "core-js": "^3.8.1",
-    "css-loader": "3.2.1",
+    "cross-env": "7.0.2",
-    "electron": "^7.1.3",
+    "css-loader": "3.4.2",
-    "electron-builder": "22.1.0",
+    "electron": "^11.1.1",
+    "electron-builder": "22.10.4",
     "electron-download": "^4.1.1",
-    "electron-installer-snap": "^4.1.0",
+    "electron-installer-snap": "^5.1.0",
-    "electron-notarize": "^0.1.1",
+    "electron-notarize": "^1.0.0",
-    "electron-rebuild": "^1.8.5",
+    "electron-rebuild": "^2.3.4",
-    "eslint": "^6.7.1",
+    "eslint": "^7.6.0",
-    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-import": "^2.21.1",
-    "file-loader": "^5.0.2",
+    "file-loader": "^5.1.0",
-    "graceful-fs": "^4.2.2",
+    "graceful-fs": "^4.2.4",
     "html-loader": "0.5.5",
     "json-loader": "0.5.7",
-    "node-abi": "^2.12.0",
+    "lru-cache": "^6.0.0",
-    "node-gyp": "^6.0.1",
+    "macos-release": "^2.4.1",
-    "node-sass": "^4.13.0",
+    "node-abi": "^2.19.3",
+    "node-gyp": "^7.1.2",
+    "node-sass": "^5.0.0",
     "npmlog": "4.1.2",
-    "npx": "^10.2.0",
+    "npx": "^10.2.2",
     "pug": "^2.0.4",
     "pug-html-loader": "1.1.5",
     "pug-lint": "^2.6.0",
     "pug-loader": "^2.4.0",
     "pug-static-loader": "2.0.0",
-    "raw-loader": "4.0.0",
+    "raw-loader": "4.0.1",
-    "sass-loader": "^8.0.0",
+    "sass-loader": "^10.1.0",
-    "shelljs": "0.8.3",
+    "shelljs": "0.8.4",
     "source-code-pro": "^2.30.2",
     "source-sans-pro": "3.6.0",
-    "style-loader": "^1.0.1",
+    "ssh2-streams": "^0.4.10",
-    "svg-inline-loader": "^0.8.0",
+    "style-loader": "^2.0.0",
+    "svg-inline-loader": "^0.8.2",
     "to-string-loader": "1.1.6",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.3",
-    "typedoc": "^0.15.3",
+    "typedoc": "^0.18.0",
-    "typescript": "^3.7.3",
+    "typescript": "^3.9.7",
     "url-loader": "^3.0.0",
-    "val-loader": "2.0.1",
+    "val-loader": "2.1.1",
-    "webpack": "^5.0.0-beta.7",
+    "webpack": "^5.11.0",
-    "webpack-cli": "^3.3.10",
+    "webpack-cli": "^4.2.0",
-    "yaml-loader": "0.5.0"
+    "yaml-loader": "0.6.0"
   },
   "resolutions": {
-    "*/node-abi": "^2.8.0"
+    "*/node-abi": "^2.19.3",
-  },
+    "**/graceful-fs": "^4.2.4"
-  "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"
-      ]
-    }
   },
   "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",
+    "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 && webpack --color --config terminus-serial/webpack.config.js",
-    "build:typings": "tsc --project terminus-core/tsconfig.typings.json && tsc --project terminus-settings/tsconfig.typings.json && tsc --project terminus-terminal/tsconfig.typings.json && tsc --project terminus-plugin-manager/tsconfig.typings.json && tsc --project terminus-ssh/tsconfig.typings.json",
+    "build:typings": "node scripts/build-typings.js",
     "watch": "cross-env TERMINUS_DEV=1 webpack --progress --color --watch",
     "start": "cross-env TERMINUS_DEV=1 electron app --debug",
+    "start:prod": "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"
+  "repository": "eugeny/terminus",
+  "author": "Eugene Pankov",
+  "license": "MIT"
 }

scripts/build-macos.js

@@ -1,17 +1,24 @@
 #!/usr/bin/env node
 const builder = require('electron-builder').build
 const vars = require('./vars')
+const fs = require('fs')
+const signHook = require('../build/mac/afterSignHook')
 
 const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/')
-const isCI = !!process.env.GITHUB_REF
+
+process.env.ARCH = process.env.ARCH || process.arch
 
 builder({
     dir: true,
     mac: ['pkg', 'zip'],
+    arm64: process.env.ARCH === 'arm64',
     config: {
         extraMetadata: {
             version: vars.version,
         },
     },
     publish: isTag ? 'always' : 'onTag',
-}).catch(() => process.exit(1))
+}).catch(e => {
+    console.error(e)
+    process.exit(1)
+})

scripts/build-native.js

@@ -8,6 +8,7 @@ for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) {
     const build = rebuild({
         buildPath: path.resolve(__dirname, '../' + dir),
         electronVersion: vars.electronVersion,
+        arch: process.env.ARCH ?? process.arch,
         force: true,
     })
     build.catch(e => {

scripts/build-typings.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+const sh = require('shelljs')
+const vars = require('./vars')
+const log = require('npmlog')
+
+vars.builtinPlugins.forEach(plugin => {
+    log.info('typings', plugin)
+    sh.exec(`npx tsc --project ${plugin}/tsconfig.typings.json`)
+})

scripts/build-windows.js

@@ -7,7 +7,7 @@ const isCI = !!process.env.GITHUB_REF
 
 builder({
     dir: true,
-    win: ['nsis', 'portable'],
+    win: ['nsis', 'zip'],
     config: {
         extraMetadata: {
             version: vars.version,

scripts/install-deps.js

@@ -10,13 +10,13 @@ const npx = `${localBinPath}/npx`;
 log.info('deps', 'app')
 
 sh.cd('app')
-sh.exec(`${npx} yarn install`)
+sh.exec(`${npx} yarn install --force`)
 sh.cd('..')
 
 vars.builtinPlugins.forEach(plugin => {
   log.info('deps', plugin)
   sh.cd(plugin)
-  sh.exec(`${npx} yarn install`)
+  sh.exec(`${npx} yarn install --force`)
   sh.cd('..')
 })
 
@@ -25,8 +25,5 @@ if (['darwin', 'linux'].includes(process.platform)) {
   for (let x of vars.builtinPlugins) {
     sh.ln('-fs', '../' + x, x)
   }
-  for (let x of vars.bundledModules) {
-    sh.ln('-fs', '../app/node_modules/' + x, x)
-  }
   sh.cd('..')
 }

scripts/prepackage-plugins.js

@@ -15,10 +15,17 @@ vars.builtinPlugins.forEach(plugin => {
   sh.cp('-r', path.join('..', plugin), '.')
   sh.rm('-rf', path.join(plugin, 'node_modules'))
   sh.cd(plugin)
-  sh.exec(`npm install --only=prod`)
+  sh.exec(`yarn install --force --production`)
+
+
   log.info('rebuild', 'native')
   if (fs.existsSync('node_modules')) {
-    rebuild(path.resolve('.'), vars.electronVersion, process.arch, [], true)
+    rebuild({
+      buildPath: path.resolve('.'),
+      electronVersion: vars.electronVersion,
+      arch: process.env.ARCH ?? process.arch,
+      force: true,
+    })
   }
   sh.cd('..')
 })

scripts/sentry-upload.js

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+const sh = require('shelljs')
+const vars = require('./vars')
+
+const sentryCli = process.platform === 'win32' ? 'node_modules\\.bin\\sentry-cli.cmd' : 'sentry-cli'
+
+sh.exec(`${sentryCli} releases new ${vars.version}`)
+
+if (process.platform === 'darwin') {
+    for (const path of [
+        'app/node_modules/@serialport/bindings/build/Release/bindings.node',
+        'app/node_modules/@terminus-term/node-pty/build/Release/pty.node',
+        'app/node_modules/fontmanager-redux/build/Release/fontmanager.node',
+        'app/node_modules/macos-native-processlist/build/Release/native.node',
+    ]) {
+        sh.exec('dsymutil ' + path)
+    }
+}
+
+sh.exec(`${sentryCli} upload-dif app/node_modules`)
+sh.exec(`${sentryCli} releases set-commits --auto ${vars.version}`)
+for (const p of vars.builtinPlugins) {
+    sh.exec(`${sentryCli} releases files ${vars.version} upload-sourcemaps ${p}/dist -u ${p}/dist/ -d ${process.platform}-${p}`)
+}

scripts/vars.js

@@ -21,6 +21,7 @@ exports.builtinPlugins = [
   'terminus-community-color-schemes',
   'terminus-plugin-manager',
   'terminus-ssh',
+  'terminus-serial',
 ]
 exports.bundledModules = [
   '@angular',

terminus-community-color-schemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-community-color-schemes",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.123-nightly.0",
   "description": "Community color schemes for Terminus",
   "keywords": [
     "terminus-builtin-plugin"
@@ -17,7 +17,7 @@
   "author": "Eugene Pankov",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "^7",
+    "@angular/core": "^9.1.9",
     "terminus-core": "*",
     "terminus-terminal": "*"
   }

terminus-community-color-schemes/tsconfig.typings.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "exclude": ["node_modules", "dist", "typings"],
+  "compilerOptions": {
+    "baseUrl": "src",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationDir": "./typings",
+    "paths": {
+      "terminus-*": ["../../terminus-*"],
+      "*": ["../../app/node_modules/*"]
+    }
+  }
+}

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

@@ -4,7 +4,7 @@ module.exports = {
     target: 'node',
     entry: 'src/index.ts',
     context: __dirname,
-    devtool: 'eval-cheap-module-source-map',
+    devtool: 'cheap-module-source-map',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'index.js',

terminus-core/.gitignore

@@ -1,2 +1 @@
 dist
-node_modules

terminus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminus-core",
-  "version": "1.0.98-nightly.0",
+  "version": "1.0.123-nightly.0",
   "description": "Terminus core",
   "keywords": [
     "terminus-builtin-plugin"
@@ -29,17 +29,18 @@
     "mixpanel": "^0.10.2",
     "ng2-dnd": "^5.0.2",
     "ngx-perfect-scrollbar": "^8.0.0",
+    "readable-stream": "2.3.7",
     "shell-escape": "^0.2.0",
-    "uuid": "^3.3.2",
+    "uuid": "^8.0.0",
-    "winston": "^3.2.1"
+    "winston": "^3.3.3"
   },
   "peerDependencies": {
-    "@angular/animations": "^7",
+    "@angular/animations": "^9.1.9",
-    "@angular/common": "^7",
+    "@angular/common": "^9.1.11",
-    "@angular/core": "^7",
+    "@angular/core": "^9.1.9",
-    "@angular/forms": "^7",
+    "@angular/forms": "^9.1.11",
-    "@angular/platform-browser": "^7",
+    "@angular/platform-browser": "^9.1.11",
-    "@angular/platform-browser-dynamic": "^7",
+    "@angular/platform-browser-dynamic": "^9.1.11",
-    "rxjs": "^5"
+    "rxjs": "^6.6.3"
   }
 }

terminus-core/src/api/configProvider.ts

@@ -33,5 +33,5 @@ export abstract class ConfigProvider {
      * }
      * ```
      */
-    platformDefaults: {[platform: string]: any} = {}
+    platformDefaults: Record<string, any> = {}
 }

terminus-core/src/api/hotkeyProvider.ts

@@ -8,7 +8,5 @@ export interface HotkeyDescription {
  * must also provide the `hotkeys.foo` config options with the default values
  */
 export abstract class HotkeyProvider {
-    hotkeys: HotkeyDescription[] = []
-
     abstract provide (): Promise<HotkeyDescription[]>
 }

terminus-core/src/api/index.ts

@@ -1,11 +1,13 @@
 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 { TabRecoveryProvider, RecoveredTab, RecoveryToken } from './tabRecovery'
 export { ToolbarButtonProvider, ToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
 export { HotkeyProvider, HotkeyDescription } from './hotkeyProvider'
 export { Theme } from './theme'
 export { TabContextMenuItemProvider } from './tabContextMenuProvider'
+export { SelectorOption } from './selector'
 
 export { AppService } from '../services/app.service'
 export { ConfigService } from '../services/config.service'
@@ -18,3 +20,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/api/selector.ts

@@ -0,0 +1,8 @@
+export interface SelectorOption<T> {
+    name: string
+    description?: string
+    result?: T
+    icon?: string
+    freeInputPattern?: string
+    callback?: (string?) => void
+}

terminus-core/src/api/tabContextMenuProvider.ts

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

terminus-core/src/api/tabRecovery.ts

@@ -12,6 +12,12 @@ export interface RecoveredTab {
     options?: any
 }
 
+export interface RecoveryToken {
+    [_: string]: any
+    type: string
+    tabColor?: string|null
+}
+
 /**
  * Extend to enable recovery for your custom tab.
  * This works in conjunction with [[getRecoveryToken()]]
@@ -34,5 +40,5 @@ export abstract class TabRecoveryProvider {
      * @returns [[RecoveredTab]] descriptor containing tab type and component inputs
      *          or `null` if this token is from a different tab type or is not supported
      */
-    abstract async recover (recoveryToken: any): Promise<RecoveredTab|null>
+    abstract async recover (recoveryToken: RecoveryToken): Promise<RecoveredTab|null>
 }

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

@@ -4,10 +4,13 @@ title-bar(
 )
 
 .content(
-    [class.tabs-on-top]='config.store.appearance.tabsLocation == "top"'
+    [class.tabs-on-top]='config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left"',
+    [class.tabs-on-side]='hasVerticalTabs()',
 )
     .tab-bar
-        .inset.background(*ngIf='hostApp.platform == Platform.macOS && config.store.appearance.frame == "thin" && config.store.appearance.tabsLocation == "top"')
+        .inset.background(*ngIf='hostApp.platform == Platform.macOS \
+        && config.store.appearance.frame == "thin" \
+        && (config.store.appearance.tabsLocation == "top" || config.store.appearance.tabsLocation == "left")')
         .tabs(
             dnd-sortable-container,
             [sortableData]='app.tabs',
@@ -18,12 +21,12 @@ title-bar(
                 [sortableIndex]='idx',
                 (onDragStart)='onTabDragStart()',
                 (onDragEnd)='onTabDragEnd()',
-
                 [index]='idx',
                 [tab]='tab',
                 [active]='tab == app.activeTab',
                 [hasActivity]='tab.activity$|async',
                 @animateTab,
+                [@.disabled]='hasVerticalTabs()',
                 (click)='app.selectTab(tab)',
                 [class.fully-draggable]='hostApp.platform != Platform.macOS',
                 [class.drag-region]='hostApp.platform == Platform.macOS && !tabsDragging',
@@ -38,7 +41,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 +52,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 +67,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 +78,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,11 +86,12 @@ title-bar(
                 *ngIf='updatesAvailable',
                 title='Update available - Click to install',
                 (click)='updateApp()',
-                [innerHTML]='sanitizeIcon(updateIcon)'
+                [fastHtmlBind]='updateIcon'
             )
 
         window-controls.background(
-            *ngIf='config.store.appearance.frame == "thin" && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
+            *ngIf='config.store.appearance.frame == "thin" \
+            && (hostApp.platform == Platform.Windows || hostApp.platform == Platform.Linux)',
         )
 
     start-page(*ngIf='ready && app.tabs.length == 0')

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

@@ -15,26 +15,73 @@
 
 $tabs-height: 38px;
 $tab-border-radius: 4px;
+$side-tab-width: 200px;
 
+.wrap {
+  display: flex;
+  width: 100vw;
+  height: 100vh;
+  flex-direction: row;
+}
 
 .content {
-    height: 100%;
+    width: 100vw;
-    flex: auto;
+    flex: 1 1 0;
+    min-height: 0;
     display: flex;
     flex-direction: column-reverse;
 
     &.tabs-on-top {
         flex-direction: column;
     }
+
+    &.tabs-on-side {
+        flex-direction: row-reverse;
+
+        &.tabs-on-top {
+            flex-direction: row;
+        }
+    }
+
 }
 
+.content.tabs-on-side > .tab-bar {
+    height: 100%;
+    width: $side-tab-width;
+    overflow-y: auto;
+    overflow-x: hidden;
+    flex-direction: column;
+    background: rgba(0, 0, 0, 0.25);
+
+    .tabs {
+        width: $side-tab-width;
+        flex: none;
+        flex-direction: column;
+
+        tab-header {
+            flex: 0 0 $tabs-height;
+        }
+    }
+
+    .drag-space {
+        flex: auto;
+    }
+
+    &>.inset {
+        opacity: 0;
+    }
+}
+
+
 .tab-bar {
     flex: none;
     height: $tabs-height;
     display: flex;
+    width: 100%;
 
     .btn-tab-bar {
         line-height: $tabs-height + 2px;
+        height: $tabs-height;
         cursor: pointer;
 
         display: flex;
@@ -50,6 +97,8 @@ $tab-border-radius: 4px;
         border: none;
         border-radius: 0;
 
+        align-items: center;
+
         &.dropdown-toggle::after {
             display: none;
         }
@@ -64,6 +113,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 {
@@ -73,7 +123,9 @@ $tab-border-radius: 4px;
 
     & > .inset {
         width: 85px;
+        height: $tabs-height;
         flex: none;
+        -webkit-app-region: drag;
     }
 
     window-controls {

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

@@ -1,6 +1,6 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 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 +75,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 +108,15 @@ 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 === 'reopen-tab') {
+                    this.app.reopenLastTab()
+                }
             }
             if (hotkey === 'toggle-fullscreen') {
                 this.hostApp.toggleFullscreen()
@@ -120,17 +128,8 @@ export class AppRootComponent {
             this.docking.dock()
         })
 
-        this.hostApp.secondInstance$.subscribe(() => {
-            this.presentWindow()
-        })
-        this.hotkeys.globalHotkey.subscribe(() => {
-            this.onGlobalHotkey()
-        })
-
         this.hostApp.windowCloseRequest$.subscribe(async () => {
-            if (await this.app.closeAllTabs()) {
+            this.app.closeWindow()
-                this.hostApp.closeWindow()
-            }
         })
 
         if (window['safeModeReason']) {
@@ -169,40 +168,6 @@ export class AppRootComponent {
         })
     }
 
-    onGlobalHotkey () {
-        if (this.hostApp.getWindow().isFocused()) {
-            this.hideWindow()
-        } else {
-            this.presentWindow()
-        }
-    }
-
-    presentWindow () {
-        if (!this.hostApp.getWindow().isVisible()) {
-            // unfocused, invisible
-            this.hostApp.getWindow().show()
-            this.hostApp.getWindow().focus()
-        } else {
-            if (this.config.store.appearance.dock === 'off') {
-                // not docked, visible
-                setTimeout(() => {
-                    this.hostApp.getWindow().focus()
-                })
-            } else {
-                // docked, visible
-                this.hostApp.getWindow().hide()
-            }
-        }
-    }
-
-    hideWindow () {
-        this.electron.loseFocus()
-        this.hostApp.getWindow().blur()
-        if (this.hostApp.platform !== Platform.macOS) {
-            this.hostApp.getWindow().hide()
-        }
-    }
-
     async ngOnInit () {
         this.ready = true
 
@@ -219,6 +184,10 @@ export class AppRootComponent {
         return false
     }
 
+    hasVerticalTabs () {
+        return this.config.store.appearance.tabsLocation === 'left' || this.config.store.appearance.tabsLocation === 'right'
+    }
+
     async updateApp () {
         if ((await this.electron.showMessageBox(
             this.hostApp.getWindow(),
@@ -254,18 +223,14 @@ 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 => {
             buttons = buttons.concat(provider.provide())
         })
         return buttons
-            .filter(button => (button.weight || 0) > 0 === aboveZero)
+            .filter(button => (button.weight ?? 0) > 0 === aboveZero)
-            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight ?? 0) - (b.weight ?? 0))
     }
 
     private updateVibrancy () {

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

@@ -1,5 +1,6 @@
 import { Observable, Subject } from 'rxjs'
 import { ViewRef } from '@angular/core'
+import { RecoveryToken } from '../api/tabRecovery'
 
 /**
  * Represents an active "process" inside a tab,
@@ -13,6 +14,11 @@ export interface BaseTabProcess {
  * Abstract base class for custom tab components
  */
 export abstract class BaseTabComponent {
+    /**
+     * Parent tab (usually a SplitTabComponent)
+     */
+    parent: BaseTabComponent|null = null
+
     /**
      * Current tab title
      */
@@ -38,7 +44,7 @@ export abstract class BaseTabComponent {
      */
     color: string|null = null
 
-    protected hasFocus = false
+    hasFocus = false
 
     /**
      * Ping this if your recovery state has been changed and you want
@@ -62,7 +68,7 @@ export abstract class BaseTabComponent {
     get destroyed$ (): Observable<void> { return this.destroyed }
     get recoveryStateChangedHint$ (): Observable<void> { return this.recoveryStateChangedHint }
 
-    constructor () {
+    protected constructor () {
         this.focused$.subscribe(() => {
             this.hasFocus = true
         })
@@ -71,7 +77,7 @@ export abstract class BaseTabComponent {
         })
     }
 
-    setTitle (title: string) {
+    setTitle (title: string): void {
         this.title = title
         if (!this.customTitle) {
             this.titleChange.next(title)
@@ -83,7 +89,7 @@ export abstract class BaseTabComponent {
      *
      * @param  {type} progress: value between 0 and 1, or `null` to remove
      */
-    setProgress (progress: number|null) {
+    setProgress (progress: number|null): void {
         this.progress.next(progress)
         if (progress) {
             if (this.progressClearTimeout) {
@@ -118,7 +124,7 @@ export abstract class BaseTabComponent {
      * @return JSON serializable tab state representation
      *         for your [[TabRecoveryProvider]] to parse
      */
-    async getRecoveryToken (): Promise<any> {
+    async getRecoveryToken (): Promise<RecoveryToken|null> {
         return null
     }
 
@@ -136,11 +142,11 @@ export abstract class BaseTabComponent {
         return true
     }
 
-    emitFocused () {
+    emitFocused (): void {
         this.focused.next()
     }
 
-    emitBlurred () {
+    emitBlurred (): void {
         this.blurred.next()
     }
 

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { NgZone, Component, Input, HostBinding, HostListener } from '@angular/core'
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
 

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component, Input, ElementRef, ViewChild } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 

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

@@ -14,7 +14,7 @@ export class SafeModeModalComponent {
         this.error = window['safeModeReason']
     }
 
-    close () {
+    close (): void {
         this.modalInstance.dismiss()
     }
 }

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

@@ -0,0 +1,26 @@
+.modal-body
+    input.form-control(
+        type='text',
+        [(ngModel)]='filter',
+        autofocus,
+        [placeholder]='name',
+        (ngModelChange)='onFilterChange()'
+    )
+
+    .list-group.mt-3(*ngIf='filteredOptions.length')
+        a.list-group-item.list-group-item-action.d-flex.align-items-center(
+            #item,
+            (click)='selectOption(option)',
+            [class.active]='selectedIndex == i',
+            *ngFor='let option of filteredOptions; let i = index'
+        )
+            i.icon(
+                class='fa-fw fas fa-{{option.icon}}',
+                *ngIf='!iconIsSVG(option.icon)'
+            )
+            .icon(
+                [fastHtmlBind]='option.icon',
+                *ngIf='iconIsSVG(option.icon)'
+            )
+            .mr-2.title {{getOptionText(option)}}
+            .text-muted {{option.description}}

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

@@ -0,0 +1,13 @@
+.list-group {
+    max-height: 70vh;
+    overflow: auto;
+}
+
+.icon {
+    width: 1.25rem;
+    margin-right: 0.25rem;
+}
+
+.title {
+    margin-left: 10px;
+}

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

@@ -0,0 +1,78 @@
+import { Component, Input, HostListener, ViewChildren, QueryList, ElementRef } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { SelectorOption } from '../api/selector'
+
+/** @hidden */
+@Component({
+    template: require('./selectorModal.component.pug'),
+    styles: [require('./selectorModal.component.scss')],
+})
+export class SelectorModalComponent<T> {
+    @Input() options: SelectorOption<T>[]
+    @Input() filteredOptions: SelectorOption<T>[]
+    @Input() filter = ''
+    @Input() name: string
+    @Input() selectedIndex = 0
+    @ViewChildren('item') itemChildren: QueryList<ElementRef>
+
+    constructor (
+        public modalInstance: NgbActiveModal,
+    ) { }
+
+    ngOnInit (): void {
+        this.onFilterChange()
+    }
+
+    @HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void {
+        if (event.key === 'ArrowUp') {
+            this.selectedIndex--
+        }
+        if (event.key === 'ArrowDown') {
+            this.selectedIndex++
+        }
+        if (event.key === 'Enter') {
+            this.selectOption(this.filteredOptions[this.selectedIndex])
+        }
+        if (event.key === 'Escape') {
+            this.close()
+        }
+
+        this.selectedIndex = (this.selectedIndex + this.filteredOptions.length) % this.filteredOptions.length
+        Array.from(this.itemChildren)[this.selectedIndex]?.nativeElement.scrollIntoView({
+            behavior: 'smooth',
+            block: 'nearest',
+        })
+    }
+
+    onFilterChange (): void {
+        const f = this.filter.trim().toLowerCase()
+        if (!f) {
+            this.filteredOptions = this.options.filter(x => !x.freeInputPattern)
+        } else {
+            // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+            this.filteredOptions = this.options.filter(x => x.freeInputPattern ?? (x.name + (x.description ?? '')).toLowerCase().includes(f))
+        }
+        this.selectedIndex = Math.max(0, this.selectedIndex)
+        this.selectedIndex = Math.min(this.filteredOptions.length - 1, this.selectedIndex)
+    }
+
+    getOptionText (option: SelectorOption<T>): string {
+        if (option.freeInputPattern) {
+            return option.freeInputPattern.replace('%s', this.filter)
+        }
+        return option.name
+    }
+
+    selectOption (option: SelectorOption<T>): void {
+        option.callback?.(this.filter)
+        this.modalInstance.close(option.result)
+    }
+
+    close (): void {
+        this.modalInstance.dismiss()
+    }
+
+    iconIsSVG (icon?: string): boolean {
+        return icon?.startsWith('<') ?? false
+    }
+}

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

@@ -1,7 +1,7 @@
 import { Observable, Subject, Subscription } from 'rxjs'
-import { Component, Injectable, ViewChild, ViewContainerRef, EmbeddedViewRef, OnInit, OnDestroy } from '@angular/core'
+import { Component, Injectable, ViewChild, ViewContainerRef, EmbeddedViewRef, AfterViewInit, OnDestroy } from '@angular/core'
 import { BaseTabComponent, BaseTabProcess } from './baseTab.component'
-import { TabRecoveryProvider, RecoveredTab } from '../api/tabRecovery'
+import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from '../api/tabRecovery'
 import { TabsService } from '../services/tabs.service'
 import { HotkeysService } from '../services/hotkeys.service'
 import { TabRecoveryService } from '../services/tabRecovery.service'
@@ -48,7 +48,7 @@ export class SplitContainer {
     /**
      * Remove unnecessarily nested child containers and renormalizes [[ratios]]
      */
-    normalize () {
+    normalize (): void {
         for (let i = 0; i < this.children.length; i++) {
             const child = this.children[i]
 
@@ -93,7 +93,7 @@ export class SplitContainer {
         return s
     }
 
-    async serialize () {
+    async serialize (): Promise<RecoveryToken> {
         const children: any[] = []
         for (const child of this.children) {
             if (child instanceof SplitContainer) {
@@ -140,7 +140,9 @@ export interface SplitSpannerInfo {
     `,
     styles: [require('./splitTab.component.scss')],
 })
-export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDestroy {
+export class SplitTabComponent extends BaseTabComponent implements AfterViewInit, OnDestroy {
+    static DIRECTIONS: SplitDirection[] = ['t', 'r', 'b', 'l']
+
     /** @hidden */
     @ViewChild('vc', { read: ViewContainerRef }) viewContainer: ViewContainerRef
 
@@ -155,7 +157,12 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     /** @hidden */
     _spanners: SplitSpannerInfo[] = []
 
-    private focusedTab: BaseTabComponent
+    /** @hidden */
+    _allFocusMode = false
+
+    /** @hidden */
+    private focusedTab: BaseTabComponent|null = null
+    private maximizedTab: BaseTabComponent|null = null
     private hotkeysSubscription: Subscription
     private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
 
@@ -163,6 +170,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     private tabRemoved = new Subject<BaseTabComponent>()
     private splitAdjusted = new Subject<SplitSpannerInfo>()
     private focusChanged = new Subject<BaseTabComponent>()
+    private initialized = new Subject<void>()
 
     get tabAdded$ (): Observable<BaseTabComponent> { return this.tabAdded }
     get tabRemoved$ (): Observable<BaseTabComponent> { return this.tabRemoved }
@@ -177,6 +185,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
      */
     get focusChanged$ (): Observable<BaseTabComponent> { return this.focusChanged }
 
+    /**
+     * Fired once tab layout is created and child tabs can be added
+     */
+    get initialized$ (): Observable<void> { return this.initialized }
+
     /** @hidden */
     constructor (
         private hotkeys: HotkeysService,
@@ -198,7 +211,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
 
         this.hotkeysSubscription = this.hotkeys.matchedHotkey.subscribe(hotkey => {
-            if (!this.hasFocus) {
+            if (!this.hasFocus || !this.focusedTab) {
                 return
             }
             switch (hotkey) {
@@ -226,6 +239,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
@@ -234,51 +254,65 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     }
 
     /** @hidden */
-    async ngOnInit () {
+    async ngAfterViewInit (): Promise<void> {
         if (this._recoveredState) {
             await this.recoverContainer(this.root, this._recoveredState)
             this.layout()
-            setImmediate(() => {
+            setTimeout(() => {
                 if (this.hasFocus) {
-                    this.getAllTabs().forEach(x => x.emitFocused())
+                    for (const tab of this.getAllTabs()) {
-                    this.focusAnyIn(this.root)
+                        this.focus(tab)
+                    }
                 }
-            })
+            }, 100)
         }
+        this.initialized.next()
+        this.initialized.complete()
     }
 
     /** @hidden */
-    ngOnDestroy () {
+    ngOnDestroy (): void {
         this.hotkeysSubscription.unsubscribe()
     }
 
     /** @returns Flat list of all sub-tabs */
-    getAllTabs () {
+    getAllTabs (): BaseTabComponent[] {
         return this.root.getAllTabs()
     }
 
-    getFocusedTab (): BaseTabComponent {
+    getFocusedTab (): BaseTabComponent|null {
         return this.focusedTab
     }
 
-    focus (tab: BaseTabComponent) {
+    getMaximizedTab (): BaseTabComponent|null {
+        return this.maximizedTab
+    }
+
+    focus (tab: BaseTabComponent): void {
         this.focusedTab = tab
         for (const x of this.getAllTabs()) {
             if (x !== tab) {
                 x.emitBlurred()
             }
         }
-        if (tab) {
+        tab.emitFocused()
-            tab.emitFocused()
+        this.focusChanged.next(tab)
-            this.focusChanged.next(tab)
+
+        if (this.maximizedTab !== tab) {
+            this.maximizedTab = null
         }
         this.layout()
     }
 
+    maximize (tab: BaseTabComponent|null): void {
+        this.maximizedTab = tab
+        this.layout()
+    }
+
     /**
      * Focuses the first available tab inside the given [[SplitContainer]]
      */
-    focusAnyIn (parent: BaseTabComponent | SplitContainer) {
+    focusAnyIn (parent?: BaseTabComponent | SplitContainer): void {
         if (!parent) {
             return
         }
@@ -292,8 +326,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     /**
      * Inserts a new `tab` to the `side` of the `relative` tab
      */
-    addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection) {
+    async addTab (tab: BaseTabComponent, relative: BaseTabComponent|null, side: SplitDirection): Promise<void> {
-        let target = (relative ? this.getParentOf(relative) : null) || this.root
+        tab.parent = this
+
+        let target = (relative ? this.getParentOf(relative) : null) ?? this.root
         let insertIndex = relative ? target.children.indexOf(relative) : -1
 
         if (
@@ -322,6 +358,9 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         target.children.splice(insertIndex, 0, tab)
 
         this.recoveryStateChangedHint.next()
+
+        await this.initialized$.toPromise()
+
         this.attachTabView(tab)
 
         setImmediate(() => {
@@ -331,7 +370,7 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         })
     }
 
-    removeTab (tab: BaseTabComponent) {
+    removeTab (tab: BaseTabComponent): void {
         const parent = this.getParentOf(tab)
         if (!parent) {
             return
@@ -341,11 +380,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         parent.children.splice(index, 1)
 
         this.detachTabView(tab)
+        tab.parent = null
 
         this.layout()
 
         this.tabRemoved.next(tab)
-
         if (this.root.children.length === 0) {
             this.destroy()
         } else {
@@ -356,7 +395,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
     /**
      * Moves focus in the given direction
      */
-    navigate (dir: SplitDirection) {
+    navigate (dir: SplitDirection): void {
+        if (!this.focusedTab) {
+            return
+        }
+
         let rel: BaseTabComponent | SplitContainer = this.focusedTab
         let parent = this.getParentOf(rel)
         if (!parent) {
@@ -389,18 +432,19 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         }
     }
 
-    async splitTab (tab: BaseTabComponent, dir: SplitDirection) {
+    async splitTab (tab: BaseTabComponent, dir: SplitDirection): Promise<BaseTabComponent|null> {
         const newTab = await this.tabsService.duplicate(tab)
         if (newTab) {
             this.addTab(newTab, tab, dir)
         }
+        return newTab
     }
 
     /**
      * @returns the immediate parent of `tab`
      */
     getParentOf (tab: BaseTabComponent | SplitContainer, root?: SplitContainer): SplitContainer|null {
-        root = root || this.root
+        root = root ?? this.root
         for (const child of root.children) {
             if (child instanceof SplitContainer) {
                 const r = this.getParentOf(tab, child)
@@ -427,15 +471,28 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
 
     /** @hidden */
     async getCurrentProcess (): Promise<BaseTabProcess|null> {
-        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x) || null
+        return (await Promise.all(this.getAllTabs().map(x => x.getCurrentProcess()))).find(x => !!x) ?? null
     }
 
     /** @hidden */
-    onSpannerAdjusted (spanner: SplitSpannerInfo) {
+    onSpannerAdjusted (spanner: SplitSpannerInfo): void {
         this.layout()
         this.splitAdjusted.next(spanner)
     }
 
+    destroy (): void {
+        super.destroy()
+        for (const x of this.getAllTabs()) {
+            x.destroy()
+        }
+    }
+
+    layout (): void {
+        this.root.normalize()
+        this._spanners = []
+        this.layoutInternal(this.root, 0, 0, 100, 100)
+    }
+
     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)
@@ -461,15 +518,9 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
         }
     }
 
-    private layout () {
-        this.root.normalize()
-        this._spanners = []
-        this.layoutInternal(this.root, 0, 0, 100, 100)
-    }
-
     private layoutInternal (root: SplitContainer, x: number, y: number, w: number, h: number) {
         const size = root.orientation === 'v' ? h : w
-        const sizes = root.ratios.map(x => x * size)
+        const sizes = root.ratios.map(ratio => ratio * size)
 
         root.x = x
         root.y = y
@@ -485,14 +536,25 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
             if (child instanceof SplitContainer) {
                 this.layoutInternal(child, childX, childY, childW, childH)
             } else {
-                const element = this.viewRefs.get(child)!.rootNodes[0]
+                const viewRef = this.viewRefs.get(child)
-                element.style.position = 'absolute'
+                if (viewRef) {
-                element.style.left = `${childX}%`
+                    const element = viewRef.rootNodes[0]
-                element.style.top = `${childY}%`
+                    element.classList.toggle('child', true)
-                element.style.width = `${childW}%`
+                    element.classList.toggle('maximized', child === this.maximizedTab)
-                element.style.height = `${childH}%`
+                    element.classList.toggle('minimized', this.maximizedTab && child !== this.maximizedTab)
+                    element.classList.toggle('focused', this._allFocusMode || 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]
 
@@ -520,20 +582,25 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
                 if (recovered) {
                     const tab = this.tabsService.create(recovered.type, recovered.options)
                     children.push(tab)
+                    tab.parent = this
                     this.attachTabView(tab)
                 } else {
                     state.ratios.splice(state.children.indexOf(childState), 0)
                 }
             }
         }
+        while (root.ratios.length < root.children.length) {
+            root.ratios.push(1)
+        }
+        root.normalize()
     }
 }
 
 /** @hidden */
 @Injectable()
 export class SplitTabRecoveryProvider extends TabRecoveryProvider {
-    async recover (recoveryToken: any): Promise<RecoveredTab|null> {
+    async recover (recoveryToken: RecoveryToken): Promise<RecoveredTab|null> {
-        if (recoveryToken && recoveryToken.type === 'app:split-tab') {
+        if (recoveryToken.type === 'app:split-tab') {
             return {
                 type: SplitTabComponent,
                 options: { _recoveredState: recoveryToken },

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component, Input, HostBinding, ElementRef, Output, EventEmitter } from '@angular/core'
 import { SplitContainer } from './splitTab.component'
 
@@ -16,21 +17,25 @@ 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.width') cssWidth: string | null
-    @HostBinding('style.height') cssHeight: string
+    @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
             let current = start
             const oldPosition: number = this.isVertical ? this.element.nativeElement.offsetTop : this.element.nativeElement.offsetLeft
 
-            const dragHandler = (e: MouseEvent) => {
+            const dragHandler = (dragEvent: MouseEvent) => {
-                current = this.isVertical ? e.pageY : e.pageX
+                current = this.isVertical ? dragEvent.pageY : dragEvent.pageX
                 const newPosition = oldPosition + (current - start)
                 if (this.isVertical) {
                     this.element.nativeElement.style.top = `${newPosition - this.marginOffset}px`
@@ -49,14 +54,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
+                if (diff) {
-                this.container.ratios[this.index] -= diff
+                    this.container.ratios[this.index - 1] += diff
-                this.change.emit()
+                    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 +86,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.cssWidth = w ? `${w}%` : null
-        this.cssHeight = h ? `${h}%` : 'initial'
+        this.cssHeight = h ? `${h}%` : null
     }
 }

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

@@ -13,7 +13,7 @@ import { ToolbarButton, ToolbarButtonProvider } from '../api'
 export class StartPageComponent {
     version: string
 
-    constructor (
+    private constructor (
         private config: ConfigService,
         private domSanitizer: DomSanitizer,
         public homeBase: HomeBaseService,
@@ -26,10 +26,10 @@ export class StartPageComponent {
             .map(provider => provider.provide())
             .reduce((a, b) => a.concat(b))
             .filter(x => !!x.click)
-            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0))
+            .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight ?? 0) - (b.weight ?? 0))
     }
 
-    sanitizeIcon (icon: string): any {
+    sanitizeIcon (icon?: string): any {
-        return this.domSanitizer.bypassSecurityTrustHtml(icon || '')
+        return this.domSanitizer.bypassSecurityTrustHtml(icon ?? '')
     }
 }

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component, Input, ViewChild, HostBinding, ViewContainerRef, OnChanges } from '@angular/core'
 import { BaseTabComponent } from '../components/baseTab.component'
 

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

@@ -1,7 +1,7 @@
 .progressbar([style.width]='progress + "%"', *ngIf='progress != null')
-.index(
+.index(*ngIf='!config.store.terminal.hideTabIndex',
     #handle,
     [style.background-color]='tab.color',
 ) {{index + 1}}
 .name([title]='tab.customTitle || tab.title') {{tab.customTitle || tab.title}}
-button((click)='app.closeTab(tab, true)') ×
+button(*ngIf='!config.store.terminal.hideCloseButton',(click)='app.closeTab(tab, true)') ×

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

@@ -13,6 +13,11 @@ $tabs-height: 38px;
 
     overflow: hidden;
 
+    &.vertical {
+      flex: none;
+      height: $tabs-height;
+    }
+
     .index {
         flex: none;
         font-weight: bold;
@@ -20,7 +25,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/components/tabHeader.component.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import type { MenuItemConstructorOptions } from 'electron'
 import { Component, Input, Optional, Inject, HostBinding, HostListener, ViewChild, ElementRef } from '@angular/core'
 import { SortableComponent } from 'ng2-dnd'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -8,10 +10,11 @@ import { HotkeysService } from '../services/hotkeys.service'
 import { ElectronService } from '../services/electron.service'
 import { AppService } from '../services/app.service'
 import { HostAppService, Platform } from '../services/hostApp.service'
+import { ConfigService } from '../services/config.service'
 
 /** @hidden */
 export interface SortableComponentProxy {
-    setDragHandle (_: HTMLElement)
+    setDragHandle: (_: HTMLElement) => void
 }
 
 /** @hidden */
@@ -30,6 +33,7 @@ export class TabHeaderComponent {
 
     private constructor (
         public app: AppService,
+        public config: ConfigService,
         private electron: ElectronService,
         private hostApp: HostAppService,
         private ngbModal: NgbModal,
@@ -48,14 +52,17 @@ export class TabHeaderComponent {
     }
 
     ngOnInit () {
-        if (this.hostApp.platform === Platform.macOS) {
-            this.parentDraggable.setDragHandle(this.handle.nativeElement)
-        }
         this.tab.progress$.subscribe(progress => {
             this.progress = progress
         })
     }
 
+    ngAfterViewInit () {
+        if (this.hostApp.platform === Platform.macOS) {
+            this.parentDraggable.setDragHandle(this.handle.nativeElement)
+        }
+    }
+
     showRenameTabModal (): void {
         const modal = this.ngbModal.open(RenameTabModalComponent)
         modal.componentInstance.value = this.tab.customTitle || this.tab.title
@@ -65,8 +72,8 @@ export class TabHeaderComponent {
         }).catch(() => null)
     }
 
-    async buildContextMenu (): Promise<Electron.MenuItemConstructorOptions[]> {
+    async buildContextMenu (): Promise<MenuItemConstructorOptions[]> {
-        let items: Electron.MenuItemConstructorOptions[] = []
+        let items: MenuItemConstructorOptions[] = []
         for (const section of await Promise.all(this.contextMenuProviders.map(x => x.getItems(this.tab, this)))) {
             items.push({ type: 'separator' })
             items = items.concat(section)

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

@@ -1,19 +1,36 @@
-.mb-4
+.container.mt-5.mb-5
-    .terminus-logo
+    .mb-4
-    h1.terminus-title Terminus
+        .terminus-logo
-        sup α 
+        h1.terminus-title Terminus
+            sup α
 
-.container
     .text-center.mb-5 Thank you for downloading Terminus!
 
     .form-line
         .header
             .title Enable analytics
-            .description Help us track the number of Terminus installs across the world!
+            .description Help track the number of Terminus installs across the world!
-        toggle(
+        toggle([(ngModel)]='config.store.enableAnalytics')
-            [(ngModel)]='config.store.enableAnalytics',
+
-            (ngModelChange)='config.save(); config.requestRestart()',
+
-        )
+    .form-line
+        .header
+            .title Enable global hotkey (#[strong Ctrl-Space])
+            .description Toggles the Terminus window visibility
+        toggle([(ngModel)]='enableGlobalHotkey')
+
+    .form-line
+        .header
+            .title Enable #[strong SSH] plugin
+            .description Adds an SSH connection manager UI to Terminus
+        toggle([(ngModel)]='enableSSH')
+
+    .form-line
+        .header
+            .title Enable #[strong Serial] plugin
+            .description Allows attaching Terminus to serial ports
+        toggle([(ngModel)]='enableSerial')
+
 
     .text-center.mt-5
         button.btn.btn-primary((click)='closeAndDisable()') Close and never show again

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

@@ -2,5 +2,7 @@
     display: flex;
     flex-direction: column;
     margin: auto;
-    flex: 0 1 500px;
+    flex: auto;
+    max-height: 100%;
+    overflow-y: auto;
 }

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

@@ -1,7 +1,8 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component } from '@angular/core'
 import { BaseTabComponent } from './baseTab.component'
 import { ConfigService } from '../services/config.service'
-import { AppService } from '../services/app.service'
+import { HostAppService } from '../services/hostApp.service'
 
 /** @hidden */
 @Component({
@@ -10,17 +11,33 @@ import { AppService } from '../services/app.service'
     styles: [require('./welcomeTab.component.scss')],
 })
 export class WelcomeTabComponent extends BaseTabComponent {
+    enableSSH = false
+    enableSerial = false
+    enableGlobalHotkey = true
+
     constructor (
-        private app: AppService,
+        private hostApp: HostAppService,
         public config: ConfigService,
     ) {
         super()
         this.setTitle('Welcome')
+        this.enableSSH = !config.store.pluginBlacklist.includes('ssh')
+        this.enableSerial = !config.store.pluginBlacklist.includes('serial')
     }
 
     closeAndDisable () {
         this.config.store.enableWelcomeTab = false
+        this.config.store.pluginBlacklist = []
+        if (!this.enableSSH) {
+            this.config.store.pluginBlacklist.push('ssh')
+        }
+        if (!this.enableSerial) {
+            this.config.store.pluginBlacklist.push('serial')
+        }
+        if (!this.enableGlobalHotkey) {
+            this.config.store.hotkeys['toggle-window'] = []
+        }
         this.config.save()
-        this.app.closeTab(this)
+        this.hostApp.getWindow().reload()
     }
 }

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

@@ -12,7 +12,8 @@ button {
     padding: 0;
     line-height: 0;
     text-align: center;
-
+    align-items: center;
+    
     &:not(:hover):not(:active) {
         background: transparent;
     }

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component } from '@angular/core'
 import { HostAppService } from '../services/hostApp.service'
 import { AppService } from '../services/app.service'
@@ -9,11 +10,9 @@ import { AppService } from '../services/app.service'
     styles: [require('./windowControls.component.scss')],
 })
 export class WindowControlsComponent {
-    constructor (public hostApp: HostAppService, public app: AppService) { }
+    private constructor (public hostApp: HostAppService, public app: AppService) { }
 
     async closeWindow () {
-        if (await this.app.closeAllTabs()) {
+        this.app.closeWindow()
-            this.hostApp.closeWindow()
-        }
     }
 }

terminus-core/src/configDefaults.linux.yaml

@@ -7,6 +7,8 @@ hotkeys:
     - 'F11'
   close-tab:
     - 'Ctrl-Shift-W'
+  reopen-tab:
+    - 'Ctrl-Shift-T'
   toggle-last-tab: []
   rename-tab:
     - 'Ctrl-Shift-R'
@@ -16,6 +18,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 +56,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

@@ -7,6 +7,8 @@ hotkeys:
     - 'Ctrl+⌘+F'
   close-tab:
     - '⌘-W'
+  reopen-tab:
+    - '⌘-Shift-T'
   toggle-last-tab: []
   rename-tab:
     - '⌘-R'
@@ -14,6 +16,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 +54,8 @@ hotkeys:
     - '⌘-⌥-Up'
   pane-nav-left:
     - '⌘-⌥-Left'
+  pane-maximize:
+    - '⌘-⌥-Enter'
   close-pane:
     - '⌘-Shift-W'
 pluginBlacklist: ['ssh']

terminus-core/src/configDefaults.windows.yaml

@@ -5,8 +5,11 @@ hotkeys:
     - 'Ctrl+Space'
   toggle-fullscreen:
     - 'F11'
+    - 'Alt-Enter'
   close-tab:
     - 'Ctrl-Shift-W'
+  reopen-tab:
+    - 'Ctrl-Shift-T'
   toggle-last-tab: []
   rename-tab:
     - 'Ctrl-Shift-R'
@@ -16,6 +19,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 +57,7 @@ hotkeys:
     - 'Ctrl-Alt-Up'
   pane-nav-left:
     - 'Ctrl-Alt-Left'
+  pane-maximize:
+    - 'Ctrl-Alt-Enter'
   close-pane: []
 pluginBlacklist: []

terminus-core/src/configDefaults.yaml

@@ -2,13 +2,15 @@ appearance:
   dock: off
   dockScreen: current
   dockFill: 0.5
+  dockHideOnBlur: false
+  dockAlwaysOnTop: true
   tabsLocation: top
   cycleTabs: true
   theme: Standard
   frame: thin
   css: '/* * { color: blue !important; } */'
   opacity: 1.0
-  vibrancy: false
+  vibrancy: true
   vibrancyType: 'blur'
 enableAnalytics: true
 enableWelcomeTab: true

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

@@ -7,7 +7,7 @@ import { Directive, AfterViewInit, ElementRef } from '@angular/core'
 export class AutofocusDirective implements AfterViewInit {
     constructor (private el: ElementRef) { }
 
-    ngAfterViewInit () {
+    ngAfterViewInit (): void {
         this.el.nativeElement.blur()
         setTimeout(() => {
             this.el.nativeElement.focus()

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 (): void {
+        this.el.nativeElement.innerHTML = this.fastHtmlBind || ''
+    }
+}

terminus-core/src/hotkeys.ts

@@ -25,6 +25,10 @@ export class AppHotkeyProvider extends HotkeyProvider {
             id: 'close-tab',
             name: 'Close tab',
         },
+        {
+            id: 'reopen-tab',
+            name: 'Reopen last tab',
+        },
         {
             id: 'toggle-last-tab',
             name: 'Toggle last tab',
@@ -37,6 +41,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 +105,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

@@ -16,11 +16,13 @@ import { TitleBarComponent } from './components/titleBar.component'
 import { ToggleComponent } from './components/toggle.component'
 import { WindowControlsComponent } from './components/windowControls.component'
 import { RenameTabModalComponent } from './components/renameTabModal.component'
+import { SelectorModalComponent } from './components/selectorModal.component'
 import { SplitTabComponent, SplitTabRecoveryProvider } from './components/splitTab.component'
 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'
@@ -34,7 +36,7 @@ import { ConfigService } from './services/config.service'
 import { StandardTheme, StandardCompactTheme, PaperTheme } from './theme'
 import { CoreConfigProvider } from './config'
 import { AppHotkeyProvider } from './hotkeys'
-import { TaskCompletionContextMenu, CommonOptionsContextMenu, CloseContextMenu } from './tabContextMenu'
+import { TaskCompletionContextMenu, CommonOptionsContextMenu, TabManagementContextMenu } from './tabContextMenu'
 
 import 'perfect-scrollbar/css/perfect-scrollbar.css'
 import 'ng2-dnd/bundles/style.css'
@@ -52,7 +54,7 @@ const PROVIDERS = [
     { provide: Theme, useClass: PaperTheme, multi: true },
     { provide: ConfigProvider, useClass: CoreConfigProvider, multi: true },
     { provide: TabContextMenuItemProvider, useClass: CommonOptionsContextMenu, multi: true },
-    { provide: TabContextMenuItemProvider, useClass: CloseContextMenu, multi: true },
+    { provide: TabContextMenuItemProvider, useClass: TabManagementContextMenu, multi: true },
     { provide: TabContextMenuItemProvider, useClass: TaskCompletionContextMenu, multi: true },
     { provide: TabRecoveryProvider, useClass: SplitTabRecoveryProvider, multi: true },
     { provide: PERFECT_SCROLLBAR_CONFIG, useValue: { suppressScrollX: true } },
@@ -64,7 +66,7 @@ const PROVIDERS = [
         BrowserModule,
         BrowserAnimationsModule,
         FormsModule,
-        NgbModule.forRoot(),
+        NgbModule,
         PerfectScrollbarModule,
         DndModule.forRoot(),
     ],
@@ -80,6 +82,8 @@ const PROVIDERS = [
         RenameTabModalComponent,
         SafeModeModalComponent,
         AutofocusDirective,
+        FastHtmlBindDirective,
+        SelectorModalComponent,
         SplitTabComponent,
         SplitTabSpannerComponent,
         WelcomeTabComponent,
@@ -87,6 +91,7 @@ const PROVIDERS = [
     entryComponents: [
         RenameTabModalComponent,
         SafeModeModalComponent,
+        SelectorModalComponent,
         SplitTabComponent,
         WelcomeTabComponent,
     ],

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

@@ -2,9 +2,13 @@
 import { Observable, Subject, AsyncSubject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 
 import { BaseTabComponent } from '../components/baseTab.component'
 import { SplitTabComponent } from '../components/splitTab.component'
+import { SelectorModalComponent } from '../components/selectorModal.component'
+import { SelectorOption } from '../api/selector'
+import { RecoveryToken } from '../api/tabRecovery'
 
 import { ConfigService } from './config.service'
 import { HostAppService } from './hostApp.service'
@@ -42,12 +46,13 @@ class CompletionObserver {
 export class AppService {
     tabs: BaseTabComponent[] = []
 
-    get activeTab (): BaseTabComponent { return this._activeTab }
+    get activeTab (): BaseTabComponent|null { return this._activeTab ?? null }
 
     private lastTabIndex = 0
-    private _activeTab: BaseTabComponent
+    private _activeTab: BaseTabComponent | null = null
+    private closedTabsStack: RecoveryToken[] = []
 
-    private activeTabChange = new Subject<BaseTabComponent>()
+    private activeTabChange = new Subject<BaseTabComponent|null>()
     private tabsChanged = new Subject<void>()
     private tabOpened = new Subject<BaseTabComponent>()
     private tabClosed = new Subject<BaseTabComponent>()
@@ -55,7 +60,7 @@ export class AppService {
 
     private completionObservers = new Map<BaseTabComponent, CompletionObserver>()
 
-    get activeTabChange$ (): Observable<BaseTabComponent> { return this.activeTabChange }
+    get activeTabChange$ (): Observable<BaseTabComponent|null> { return this.activeTabChange }
     get tabOpened$ (): Observable<BaseTabComponent> { return this.tabOpened }
     get tabsChanged$ (): Observable<void> { return this.tabsChanged }
     get tabClosed$ (): Observable<BaseTabComponent> { return this.tabClosed }
@@ -64,38 +69,51 @@ export class AppService {
     get ready$ (): Observable<void> { return this.ready }
 
     /** @hidden */
-    constructor (
+    private constructor (
         private config: ConfigService,
         private hostApp: HostAppService,
         private tabRecovery: TabRecoveryService,
         private tabsService: TabsService,
+        private ngbModal: NgbModal,
     ) {
-        if (hostApp.getWindow().id === 1) {
-            if (config.store.terminal.recoverTabs) {
-                this.tabRecovery.recoverTabs().then(tabs => {
-                    for (const tab of tabs) {
-                        this.openNewTabRaw(tab.type, tab.options)
-                    }
-                    this.startTabStorage()
-                })
-            } else {
-                /** Continue to store the tabs even if the setting is currently off */
-                this.startTabStorage()
-            }
-        }
-    }
-
-    startTabStorage () {
         this.tabsChanged$.subscribe(() => {
             this.tabRecovery.saveTabs(this.tabs)
         })
         setInterval(() => {
             this.tabRecovery.saveTabs(this.tabs)
         }, 30000)
+
+        if (hostApp.getWindow().id === 1) {
+            if (config.store.terminal.recoverTabs) {
+                this.tabRecovery.recoverTabs().then(tabs => {
+                    for (const tab of tabs) {
+                        this.openNewTabRaw(tab.type, tab.options)
+                    }
+                    this.tabRecovery.enabled = true
+                })
+            } else {
+                /** Continue to store the tabs even if the setting is currently off */
+                this.tabRecovery.enabled = true
+            }
+        }
+
+        hostApp.windowFocused$.subscribe(() => this._activeTab?.emitFocused())
+
+        this.tabClosed$.subscribe(async tab => {
+            const token = await tab.getRecoveryToken()
+            if (token) {
+                this.closedTabsStack.push(token)
+            }
+        })
     }
 
-    addTabRaw (tab: BaseTabComponent) {
+    addTabRaw (tab: BaseTabComponent, index: number|null = null): void {
-        this.tabs.push(tab)
+        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,13 +139,18 @@ export class AppService {
             this.tabsChanged.next()
             this.tabClosed.next(tab)
         })
+
+        if (tab instanceof SplitTabComponent) {
+            tab.tabAdded$.subscribe(() => this.emitTabsChanged())
+            tab.tabRemoved$.subscribe(() => this.emitTabsChanged())
+        }
     }
 
     /**
      * Adds a new tab **without** wrapping it in a SplitTabComponent
      * @param inputs  Properties to be assigned on the new tab component instance
      */
-    openNewTabRaw (type: TabComponentType, inputs?: any): BaseTabComponent {
+    openNewTabRaw (type: TabComponentType, inputs?: Record<string, any>): BaseTabComponent {
         const tab = this.tabsService.create(type, inputs)
         this.addTabRaw(tab)
         return tab
@@ -137,7 +160,7 @@ export class AppService {
      * Adds a new tab while wrapping it in a SplitTabComponent
      * @param inputs  Properties to be assigned on the new tab component instance
      */
-    openNewTab (type: TabComponentType, inputs?: any): BaseTabComponent {
+    openNewTab (type: TabComponentType, inputs?: Record<string, any>): BaseTabComponent {
         const splitTab = this.tabsService.create(SplitTabComponent) as SplitTabComponent
         const tab = this.tabsService.create(type, inputs)
         splitTab.addTab(tab, null, 'r')
@@ -145,12 +168,29 @@ export class AppService {
         return tab
     }
 
-    selectTab (tab: BaseTabComponent) {
+    async reopenLastTab (): Promise<BaseTabComponent|null> {
-        if (this._activeTab === tab) {
+        const token = this.closedTabsStack.pop()
+        if (token) {
+            const recoveredTab = await this.tabRecovery.recoverTab(token)
+            if (recoveredTab) {
+                const tab = this.tabsService.create(recoveredTab.type, recoveredTab.options)
+                if (this.activeTab) {
+                    this.addTabRaw(tab, this.tabs.indexOf(this.activeTab) + 1)
+                } else {
+                    this.addTabRaw(tab)
+                }
+                return tab
+            }
+        }
+        return null
+    }
+
+    selectTab (tab: BaseTabComponent|null): void {
+        if (tab && this._activeTab === tab) {
             this._activeTab.emitFocused()
             return
         }
-        if (this.tabs.includes(this._activeTab)) {
+        if (this._activeTab && this.tabs.includes(this._activeTab)) {
             this.lastTabIndex = this.tabs.indexOf(this._activeTab)
         } else {
             this.lastTabIndex = 0
@@ -161,23 +201,35 @@ export class AppService {
         }
         this._activeTab = tab
         this.activeTabChange.next(tab)
-        if (this._activeTab) {
+        setImmediate(() => {
-            setImmediate(() => {
+            this._activeTab?.emitFocused()
-                this._activeTab.emitFocused()
+        })
-            })
+        this.hostApp.setTitle(this._activeTab?.title)
-            this.hostApp.setTitle(this._activeTab.title)
+    }
+
+    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 () {
+    toggleLastTab (): void {
         if (!this.lastTabIndex || this.lastTabIndex >= this.tabs.length) {
             this.lastTabIndex = 0
         }
         this.selectTab(this.tabs[this.lastTabIndex])
     }
 
-    nextTab () {
+    nextTab (): void {
+        if (!this._activeTab) {
+            return
+        }
         if (this.tabs.length > 1) {
             const tabIndex = this.tabs.indexOf(this._activeTab)
             if (tabIndex < this.tabs.length - 1) {
@@ -188,7 +240,10 @@ export class AppService {
         }
     }
 
-    previousTab () {
+    previousTab (): void {
+        if (!this._activeTab) {
+            return
+        }
         if (this.tabs.length > 1) {
             const tabIndex = this.tabs.indexOf(this._activeTab)
             if (tabIndex > 0) {
@@ -199,8 +254,43 @@ export class AppService {
         }
     }
 
+    moveSelectedTabLeft (): void {
+        if (!this._activeTab) {
+            return
+        }
+        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 (): void {
+        if (!this._activeTab) {
+            return
+        }
+        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): void {
+        const i1 = this.tabs.indexOf(a)
+        const i2 = this.tabs.indexOf(b)
+        this.tabs[i1] = b
+        this.tabs[i2] = a
+    }
+
     /** @hidden */
-    emitTabsChanged () {
+    emitTabsChanged (): void {
         this.tabsChanged.next()
     }
 
@@ -214,11 +304,12 @@ export class AppService {
         tab.destroy()
     }
 
-    async duplicateTab (tab: BaseTabComponent) {
+    async duplicateTab (tab: BaseTabComponent): Promise<BaseTabComponent|null> {
         const dup = await this.tabsService.duplicate(tab)
         if (dup) {
-            this.addTabRaw(dup)
+            this.addTabRaw(dup, this.tabs.indexOf(tab) + 1)
         }
+        return dup
     }
 
     /**
@@ -236,8 +327,18 @@ export class AppService {
         return true
     }
 
+    async closeWindow (): Promise<void> {
+        this.tabRecovery.enabled = false
+        await this.tabRecovery.saveTabs(this.tabs)
+        if (await this.closeAllTabs()) {
+            this.hostApp.closeWindow()
+        } else {
+            this.tabRecovery.enabled = true
+        }
+    }
+
     /** @hidden */
-    emitReady () {
+    emitReady (): void {
         this.ready.next()
         this.ready.complete()
         this.hostApp.emitReady()
@@ -258,7 +359,15 @@ export class AppService {
         return this.completionObservers.get(tab)!.done$
     }
 
-    stopObservingTabCompletion (tab: BaseTabComponent) {
+    stopObservingTabCompletion (tab: BaseTabComponent): void {
         this.completionObservers.delete(tab)
     }
+
+    showSelector <T> (name: string, options: SelectorOption<T>[]): Promise<T> {
+        const modal = this.ngbModal.open(SelectorModalComponent)
+        const instance: SelectorModalComponent<T> = modal.componentInstance
+        instance.name = name
+        instance.options = options
+        return modal.result as Promise<T>
+    }
 }

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

@@ -20,7 +20,7 @@ function isNonStructuralObjectMember (v): boolean {
 
 /** @hidden */
 export class ConfigProxy {
-    constructor (real: any, defaults: any) {
+    constructor (real: Record<string, any>, defaults: Record<string, any>) {
         for (const key in defaults) {
             if (isStructuralMember(defaults[key])) {
                 if (!real[key]) {
@@ -71,8 +71,10 @@ export class ConfigProxy {
         }
     }
 
-    getValue (_key: string): any { } // eslint-disable-line @typescript-eslint/no-empty-function
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
-    setValue (_key: string, _value: any) { } // eslint-disable-line @typescript-eslint/no-empty-function
+    getValue (_key: string): any { }
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-empty-function
+    setValue (_key: string, _value: any) { }
 }
 
 @Injectable({ providedIn: 'root' })
@@ -95,22 +97,19 @@ export class ConfigService {
     private changed = new Subject<void>()
     private _store: any
     private defaults: any
-    private servicesCache: { [id: string]: Function[] }|null = null
+    private servicesCache: Record<string, Function[]>|null = null // eslint-disable-line @typescript-eslint/ban-types
 
     get changed$ (): Observable<void> { return this.changed }
 
     /** @hidden */
-    constructor (
+    private constructor (
         electron: ElectronService,
         private hostApp: HostAppService,
         @Inject(ConfigProvider) configProviders: ConfigProvider[],
     ) {
         this.path = path.join(electron.app.getPath('userData'), 'config.yaml')
         this.defaults = configProviders.map(provider => {
-            let defaults = {}
+            let defaults = provider.platformDefaults[hostApp.platform] || {}
-            if (provider.platformDefaults) {
-                defaults = configMerge(defaults, provider.platformDefaults[hostApp.platform] || {})
-            }
             if (provider.defaults) {
                 defaults = configMerge(defaults, provider.defaults)
             }
@@ -124,8 +123,23 @@ export class ConfigService {
         })
     }
 
-    getDefaults () {
+    getDefaults (): Record<string, any> {
-        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 {
@@ -138,9 +152,11 @@ export class ConfigService {
     }
 
     save (): void {
+        // Scrub undefined values
+        this._store = JSON.parse(JSON.stringify(this._store))
         fs.writeFileSync(this.path, yaml.safeDump(this._store), 'utf8')
         this.emitChange()
-        this.hostApp.broadcastConfigChange()
+        this.hostApp.broadcastConfigChange(JSON.parse(JSON.stringify(this.store)))
     }
 
     /**
@@ -170,15 +186,15 @@ export class ConfigService {
      *
      * @typeparam T Base provider type
      */
-    enabledServices<T extends object> (services: T[]): T[] {
+    enabledServices<T extends object> (services: T[]): T[] { // eslint-disable-line @typescript-eslint/ban-types
         if (!this.servicesCache) {
             this.servicesCache = {}
-            const ngModule = window['rootModule'].ngInjectorDef
+            const ngModule = window['rootModule'].ɵinj
             for (const imp of ngModule.imports) {
-                const module = imp['ngModule'] || imp
+                const module = imp.ngModule || imp
-                if (module.ngInjectorDef && module.ngInjectorDef.providers) {
+                if (module.ɵinj?.providers) {
-                    this.servicesCache[module['pluginName']] = module.ngInjectorDef.providers.map(provider => {
+                    this.servicesCache[module.pluginName] = module.ɵinj.providers.map(provider => {
-                        return provider['useClass'] || provider
+                        return provider.useClass || provider
                     })
                 }
             }

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

@@ -1,3 +1,4 @@
+import type { Display } from 'electron'
 import { Injectable } from '@angular/core'
 import { ConfigService } from '../services/config.service'
 import { ElectronService } from '../services/electron.service'
@@ -6,16 +7,16 @@ import { HostAppService, Bounds } from '../services/hostApp.service'
 @Injectable({ providedIn: 'root' })
 export class DockingService {
     /** @hidden */
-    constructor (
+    private constructor (
         private electron: ElectronService,
         private config: ConfigService,
         private hostApp: HostAppService,
     ) {
-        electron.screen.on('display-removed', () => this.repositionWindow())
+        hostApp.displaysChanged$.subscribe(() => this.repositionWindow())
-        electron.screen.on('display-metrics-changed', () => this.repositionWindow())
+        hostApp.displayMetricsChanged$.subscribe(() => this.repositionWindow())
     }
 
-    dock () {
+    dock (): void {
         const dockSide = this.config.store.appearance.dock
 
         if (dockSide === 'off') {
@@ -25,6 +26,7 @@ export class DockingService {
 
         let display = this.electron.screen.getAllDisplays()
             .filter(x => x.id === this.config.store.appearance.dockScreen)[0]
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         if (!display) {
             display = this.getCurrentScreen()
         }
@@ -53,24 +55,27 @@ export class DockingService {
             newBounds.y = display.bounds.y
         }
 
-        this.hostApp.setAlwaysOnTop(true)
+        const alwaysOnTop = this.config.store.appearance.dockAlwaysOnTop
+
+        this.hostApp.setAlwaysOnTop(alwaysOnTop)
         setImmediate(() => {
             this.hostApp.setBounds(newBounds)
         })
     }
 
-    getCurrentScreen () {
+    getCurrentScreen (): Display {
         return this.electron.screen.getDisplayNearestPoint(this.electron.screen.getCursorScreenPoint())
     }
 
-    getScreens () {
+    getScreens (): Display[] {
         const primaryDisplayID = this.electron.screen.getPrimaryDisplay().id
         return this.electron.screen.getAllDisplays().sort((a, b) =>
             a.bounds.x === b.bounds.x ? a.bounds.y - b.bounds.y : a.bounds.x - b.bounds.x
-        ).map((display,index) => {
+        ).map((display, index) => {
             return {
+                ...display,
                 id: display.id,
-                name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index +1}`,
+                name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index + 1}`,
             }
         })
     }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { TouchBar, BrowserWindow, Menu, MenuItem, NativeImage } from 'electron'
+import { App, IpcRenderer, Shell, Dialog, Clipboard, GlobalShortcut, Screen, Remote, AutoUpdater, TouchBar, BrowserWindow, Menu, MenuItem, NativeImage, MessageBoxOptions } from 'electron'
 
 export interface MessageBoxResponse {
     response: number
@@ -8,16 +8,16 @@ export interface MessageBoxResponse {
 
 @Injectable({ providedIn: 'root' })
 export class ElectronService {
-    app: Electron.App
+    app: App
-    ipcRenderer: Electron.IpcRenderer
+    ipcRenderer: IpcRenderer
-    shell: Electron.Shell
+    shell: Shell
-    dialog: Electron.Dialog
+    dialog: Dialog
-    clipboard: Electron.Clipboard
+    clipboard: Clipboard
-    globalShortcut: Electron.GlobalShortcut
+    globalShortcut: GlobalShortcut
     nativeImage: typeof NativeImage
-    screen: Electron.Screen
+    screen: Screen
-    remote: Electron.Remote
+    remote: Remote
-    autoUpdater: Electron.AutoUpdater
+    autoUpdater: AutoUpdater
     TouchBar: typeof TouchBar
     BrowserWindow: typeof BrowserWindow
     Menu: typeof Menu
@@ -25,7 +25,7 @@ export class ElectronService {
     private electron: any
 
     /** @hidden */
-    constructor () {
+    private constructor () {
         this.electron = require('electron')
         this.remote = this.electron.remote
         this.app = this.remote.app
@@ -43,18 +43,9 @@ export class ElectronService {
         this.MenuItem = this.remote.MenuItem
     }
 
-    /**
-     * Removes OS focus from Terminus' window
-     */
-    loseFocus () {
-        if (process.platform === 'darwin') {
-            this.remote.Menu.sendActionToFirstResponder('hide:')
-        }
-    }
-
     async showMessageBox (
-        browserWindow: Electron.BrowserWindow,
+        browserWindow: BrowserWindow,
-        options: Electron.MessageBoxOptions
+        options: MessageBoxOptions
     ): Promise<MessageBoxResponse> {
         return this.dialog.showMessageBox(browserWindow, options)
     }

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

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'
 import { ElectronService } from './electron.service'
 import { ConfigService } from './config.service'
 import * as mixpanel from 'mixpanel'
-import * as uuidv4 from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 
 @Injectable({ providedIn: 'root' })
 export class HomeBaseService {
@@ -11,7 +11,7 @@ export class HomeBaseService {
     mixpanel: any
 
     /** @hidden */
-    constructor (
+    private constructor (
         private electron: ElectronService,
         private config: ConfigService,
     ) {
@@ -22,24 +22,29 @@ export class HomeBaseService {
         }
     }
 
-    openGitHub () {
+    openGitHub (): void {
         this.electron.shell.openExternal('https://github.com/eugeny/terminus')
     }
 
-    reportBug () {
+    reportBug (): void {
         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`
         this.electron.shell.openExternal(`https://github.com/eugeny/terminus/issues/new?body=${encodeURIComponent(body)}&labels=${label}`)
     }
 
-    enableAnalytics () {
+    enableAnalytics (): void {
         if (!window.localStorage.analyticsUserID) {
             window.localStorage.analyticsUserID = uuidv4()
         }
@@ -51,9 +56,9 @@ export class HomeBaseService {
         this.mixpanel.track('launch', this.getAnalyticsProperties())
     }
 
-    getAnalyticsProperties () {
+    getAnalyticsProperties (): Record<string, string> {
         return {
-            distinct_id: window.localStorage.analyticsUserID, // eslint-disable-line @typescript-eslint/camelcase
+            distinct_id: window.localStorage.analyticsUserID,
             platform: process.platform,
             os: os.release(),
             version: this.appVersion,

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

@@ -1,12 +1,16 @@
+import type { BrowserWindow, TouchBar, MenuItemConstructorOptions } from 'electron'
 import * as path from 'path'
 import shellEscape from 'shell-escape'
 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_SUPPORTED } from '../utils'
 
 export enum Platform {
-    Linux, macOS, Windows,
+    Linux = 'Linux',
+    macOS = 'macOS',
+    Windows = 'Windows',
 }
 
 export interface Bounds {
@@ -39,7 +43,9 @@ 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 displaysChanged = new Subject<void>()
     private logger: Logger
     private windowId: number
 
@@ -85,8 +91,12 @@ export class HostAppService {
 
     get windowMoved$ (): Observable<void> { return this.windowMoved }
 
+    get windowFocused$ (): Observable<void> { return this.windowFocused }
+
     get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
 
+    get displaysChanged$ (): Observable<void> { return this.displaysChanged }
+
     private constructor (
         private zone: NgZone,
         private electron: ElectronService,
@@ -128,10 +138,18 @@ 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())
         })
 
+        electron.ipcRenderer.on('host:displays-changed', () => {
+            this.zone.run(() => this.displaysChanged.next())
+        })
+
         electron.ipcRenderer.on('host:second-instance', (_$event, argv: any, cwd: string) => this.zone.run(() => {
             this.logger.info('Second instance', argv)
             const op = argv._[0]
@@ -157,53 +175,57 @@ export class HostAppService {
         electron.ipcRenderer.on('host:config-change', () => this.zone.run(() => {
             this.configChangeBroadcast.next()
         }))
+
+        if (isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)) {
+            electron.ipcRenderer.send('window-set-disable-vibrancy-while-dragging', true)
+        }
     }
 
     /**
      * Returns the current remote [[BrowserWindow]]
      */
-    getWindow () {
+    getWindow (): BrowserWindow {
-        return this.electron.BrowserWindow.fromId(this.windowId)
+        return this.electron.BrowserWindow.fromId(this.windowId)!
     }
 
-    newWindow () {
+    newWindow (): void {
         this.electron.ipcRenderer.send('app:new-window')
     }
 
-    toggleFullscreen () {
+    toggleFullscreen (): void {
         const window = this.getWindow()
         window.setFullScreen(!this.isFullScreen)
     }
 
-    openDevTools () {
+    openDevTools (): void {
         this.getWindow().webContents.openDevTools({ mode: 'undocked' })
     }
 
-    focusWindow () {
+    focusWindow (): void {
         this.electron.ipcRenderer.send('window-focus')
     }
 
-    minimize () {
+    minimize (): void {
         this.electron.ipcRenderer.send('window-minimize')
     }
 
-    maximize () {
+    maximize (): void {
         this.electron.ipcRenderer.send('window-maximize')
     }
 
-    unmaximize () {
+    unmaximize (): void {
         this.electron.ipcRenderer.send('window-unmaximize')
     }
 
-    toggleMaximize () {
+    toggleMaximize (): void {
         this.electron.ipcRenderer.send('window-toggle-maximize')
     }
 
-    setBounds (bounds: Bounds) {
+    setBounds (bounds: Bounds): void {
         this.electron.ipcRenderer.send('window-set-bounds', bounds)
     }
 
-    setAlwaysOnTop (flag: boolean) {
+    setAlwaysOnTop (flag: boolean): void {
         this.electron.ipcRenderer.send('window-set-always-on-top', flag)
     }
 
@@ -212,48 +234,50 @@ export class HostAppService {
      *
      * @param type `null`, or `fluent` when supported (Windowd only)
      */
-    setVibrancy (enable: boolean, type: string) {
+    setVibrancy (enable: boolean, type: string|null): void {
+        if (this.platform === Platform.Windows && !isWindowsBuild(WIN_BUILD_FLUENT_BG_SUPPORTED)) {
+            type = null
+        }
         document.body.classList.toggle('vibrant', enable)
-        if (this.platform === Platform.macOS) {
+        this.electron.ipcRenderer.send('window-set-vibrancy', enable, type)
-            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)
-        }
     }
 
-    setTitle (title: string) {
+    setTitle (title?: string): void {
-        this.electron.ipcRenderer.send('window-set-title', title)
+        this.electron.ipcRenderer.send('window-set-title', title ?? 'Terminus')
     }
 
-    setTouchBar (touchBar: Electron.TouchBar) {
+    setTouchBar (touchBar: TouchBar): void {
         this.getWindow().setTouchBar(touchBar)
     }
 
-    popupContextMenu (menuDefinition: Electron.MenuItemConstructorOptions[]) {
+    popupContextMenu (menuDefinition: MenuItemConstructorOptions[]): void {
         this.electron.Menu.buildFromTemplate(menuDefinition).popup({})
     }
 
     /**
      * Notifies other windows of config file changes
      */
-    broadcastConfigChange () {
+    broadcastConfigChange (configStore: Record<string, any>): void {
-        this.electron.ipcRenderer.send('app:config-change')
+        this.electron.ipcRenderer.send('app:config-change', configStore)
     }
 
-    emitReady () {
+    emitReady (): void {
         this.electron.ipcRenderer.send('app:ready')
     }
 
-    bringToFront () {
+    bringToFront (): void {
         this.electron.ipcRenderer.send('window-bring-to-front')
     }
 
-    closeWindow () {
+    closeWindow (): void {
         this.electron.ipcRenderer.send('window-close')
     }
 
-    relaunch () {
+    registerGlobalHotkey (specs: string[]): void {
+        this.electron.ipcRenderer.send('app:register-global-hotkey', specs)
+    }
+
+    relaunch (): void {
         if (this.isPortable) {
             this.electron.app.relaunch({ execPath: process.env.PORTABLE_EXECUTABLE_FILE })
         } else {
@@ -262,7 +286,7 @@ export class HostAppService {
         this.electron.app.exit()
     }
 
-    quit () {
+    quit (): void {
         this.logger.info('Quitting')
         this.electron.app.quit()
     }

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

@@ -1,8 +1,10 @@
 import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
+import { Observable, Subject } from 'rxjs'
 import { HotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
 import { stringifyKeySequence } from './hotkeys.util'
-import { ConfigService } from '../services/config.service'
+import { ConfigService } from './config.service'
-import { ElectronService } from '../services/electron.service'
+import { ElectronService } from './electron.service'
+import { HostAppService } from './hostApp.service'
 
 export interface PartialHotkeyMatch {
     id: string
@@ -20,14 +22,23 @@ interface EventBufferEntry {
 @Injectable({ providedIn: 'root' })
 export class HotkeysService {
     key = new EventEmitter<KeyboardEvent>()
+
+    /** @hidden */
     matchedHotkey = new EventEmitter<string>()
-    globalHotkey = new EventEmitter<void>()
+
+    /**
+     * Fired for each recognized hotkey
+     */
+    get hotkey$ (): Observable<string> { return this._hotkey }
+
+    private _hotkey = new Subject<string>()
     private currentKeystrokes: EventBufferEntry[] = []
     private disabledLevel = 0
     private hotkeyDescriptions: HotkeyDescription[] = []
 
     private constructor (
         private zone: NgZone,
+        private hostApp: HostAppService,
         private electron: ElectronService,
         private config: ConfigService,
         @Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[],
@@ -49,6 +60,9 @@ export class HotkeysService {
         this.getHotkeyDescriptions().then(hotkeys => {
             this.hotkeyDescriptions = hotkeys
         })
+
+        // deprecated
+        this.hotkey$.subscribe(h => this.matchedHotkey.emit(h))
     }
 
     /**
@@ -57,7 +71,7 @@ export class HotkeysService {
      * @param name DOM event name
      * @param nativeEvent event object
      */
-    pushKeystroke (name: string, nativeEvent: KeyboardEvent) {
+    pushKeystroke (name: string, nativeEvent: KeyboardEvent): void {
         (nativeEvent as any).event = name
         this.currentKeystrokes.push({ event: nativeEvent, time: performance.now() })
     }
@@ -65,26 +79,26 @@ export class HotkeysService {
     /**
      * Check the buffer for new complete keystrokes
      */
-    processKeystrokes () {
+    processKeystrokes (): void {
         if (this.isEnabled()) {
             this.zone.run(() => {
                 const matched = this.getCurrentFullyMatchedHotkey()
                 if (matched) {
                     console.log('Matched hotkey', matched)
-                    this.matchedHotkey.emit(matched)
+                    this._hotkey.next(matched)
                     this.clearCurrentKeystrokes()
                 }
             })
         }
     }
 
-    emitKeyEvent (nativeEvent: KeyboardEvent) {
+    emitKeyEvent (nativeEvent: KeyboardEvent): void {
         this.zone.run(() => {
             this.key.emit(nativeEvent)
         })
     }
 
-    clearCurrentKeystrokes () {
+    clearCurrentKeystrokes (): void {
         this.currentKeystrokes = []
     }
 
@@ -142,15 +156,15 @@ export class HotkeysService {
         return this.hotkeyDescriptions.filter((x) => x.id === id)[0]
     }
 
-    enable () {
+    enable (): void {
         this.disabledLevel--
     }
 
-    disable () {
+    disable (): void {
         this.disabledLevel++
     }
 
-    isEnabled () {
+    isEnabled (): boolean {
         return this.disabledLevel === 0
     }
 
@@ -158,7 +172,7 @@ export class HotkeysService {
         return (
             await Promise.all(
                 this.config.enabledServices(this.hotkeyProviders)
-                    .map(async x => x.provide ? x.provide() : x.hotkeys)
+                    .map(async x => x.provide())
             )
         ).reduce((a, b) => a.concat(b))
     }
@@ -169,21 +183,23 @@ export class HotkeysService {
         if (typeof value === 'string') {
             value = [value]
         }
+        const specs: string[] = []
         value.forEach((item: string | string[]) => {
             item = typeof item === 'string' ? [item] : item
 
             try {
                 let electronKeySpec = item[0]
+                electronKeySpec = electronKeySpec.replace('Meta', 'Super')
                 electronKeySpec = electronKeySpec.replace('⌘', 'Command')
                 electronKeySpec = electronKeySpec.replace('⌥', 'Alt')
                 electronKeySpec = electronKeySpec.replace(/-/g, '+')
-                this.electron.globalShortcut.register(electronKeySpec, () => {
+                specs.push(electronKeySpec)
-                    this.globalHotkey.emit()
-                })
             } catch (err) {
                 console.error('Could not register the global hotkey:', err)
             }
         })
+
+        this.hostApp.registerGlobalHotkey(specs)
     }
 
     private getHotkeysConfig () {
@@ -203,7 +219,10 @@ export class HotkeysService {
                 if (typeof value === 'string') {
                     value = [value]
                 }
-                if (value) {
+                if (!(value instanceof Array)) {
+                    continue
+                }
+                if (value.length > 0) {
                     value = value.map((item: string | string[]) => typeof item === 'string' ? [item] : item)
                     keys[key] = value
                 }

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

@@ -28,44 +28,42 @@ const initializeWinston = (electron: ElectronService) => {
 
 export class Logger {
     constructor (
-        private winstonLogger: any,
+        private winstonLogger: winston.Logger,
         private name: string,
     ) {}
 
-    debug (...args: any[]) {
+    debug (...args: any[]): void {
         this.doLog('debug', ...args)
     }
 
-    info (...args: any[]) {
+    info (...args: any[]): void {
         this.doLog('info', ...args)
     }
 
-    warn (...args: any[]) {
+    warn (...args: any[]): void {
         this.doLog('warn', ...args)
     }
 
-    error (...args: any[]) {
+    error (...args: any[]): void {
         this.doLog('error', ...args)
     }
 
-    log (...args: any[]) {
+    log (...args: any[]): void {
         this.doLog('log', ...args)
     }
 
-    private doLog (level: string, ...args: any[]) {
+    private doLog (level: string, ...args: any[]): void {
         console[level](`%c[${this.name}]`, 'color: #aaa', ...args)
-        if (this.winstonLogger) {
+        this.winstonLogger[level](...args)
-            this.winstonLogger[level](...args)
-        }
     }
 }
 
 @Injectable({ providedIn: 'root' })
 export class LogService {
-    private log: any
+    private log: winston.Logger
 
     /** @hidden */
-    constructor (electron: ElectronService) {
+    private constructor (electron: ElectronService) {
         this.log = initializeWinston(electron)
     }
 

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,15 +18,22 @@ 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"',
         },
     ]
-    constructor (
+    private constructor (
         private electron: ElectronService,
         private hostApp: HostAppService,
     ) {
@@ -37,7 +44,7 @@ export class ShellIntegrationService {
                 'extras',
                 'automator-workflows',
             )
-            this.automatorWorkflowsDestination = path.join(process.env.HOME as string, 'Library', 'Services')
+            this.automatorWorkflowsDestination = path.join(process.env.HOME!, 'Library', 'Services')
         }
         this.updatePaths()
     }
@@ -51,8 +58,8 @@ export class ShellIntegrationService {
         return true
     }
 
-    async install () {
+    async install (): Promise<void> {
-        const exe: string = process.env.PORTABLE_EXECUTABLE_FILE || this.electron.app.getPath('exe')
+        const exe: string = process.env.PORTABLE_EXECUTABLE_FILE ?? this.electron.app.getPath('exe')
         if (this.hostApp.platform === Platform.macOS) {
             for (const wf of this.automatorWorkflows) {
                 await exec(`cp -r "${this.automatorWorkflowsLocation}/${wf}" "${this.automatorWorkflowsDestination}"`)
@@ -61,13 +68,21 @@ 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')
+            }
         }
     }
 
-    async remove () {
+    async remove (): Promise<void> {
         if (this.hostApp.platform === Platform.macOS) {
             for (const wf of this.automatorWorkflows) {
                 await exec(`rm -rf "${this.automatorWorkflowsDestination}/${wf}"`)

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

@@ -1,5 +1,5 @@
 import { Injectable, Inject } from '@angular/core'
-import { TabRecoveryProvider, RecoveredTab } from '../api/tabRecovery'
+import { TabRecoveryProvider, RecoveredTab, RecoveryToken } from '../api/tabRecovery'
 import { BaseTabComponent } from '../components/baseTab.component'
 import { Logger, LogService } from '../services/log.service'
 import { ConfigService } from '../services/config.service'
@@ -8,30 +8,44 @@ import { ConfigService } from '../services/config.service'
 @Injectable({ providedIn: 'root' })
 export class TabRecoveryService {
     logger: Logger
+    enabled = false
 
-    constructor (
+    private constructor (
-        @Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[],
+        @Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[]|null,
         private config: ConfigService,
         log: LogService
     ) {
         this.logger = log.create('tabRecovery')
     }
 
-    async saveTabs (tabs: BaseTabComponent[]) {
+    async saveTabs (tabs: BaseTabComponent[]): Promise<void> {
+        if (!this.enabled) {
+            return
+        }
         window.localStorage.tabsRecovery = JSON.stringify(
-            await Promise.all(
+            (await Promise.all(
                 tabs
-                    .map(tab => tab.getRecoveryToken())
+                    .map(async tab => tab.getRecoveryToken().then(r => {
-                    .filter(token => !!token)
+                        if (r) {
-            )
+                            r.tabTitle = tab.title
+                            if (tab.color) {
+                                r.tabColor = tab.color
+                            }
+                        }
+                        return r
+                    }))
+            )).filter(token => !!token)
         )
     }
 
-    async recoverTab (token: any): Promise<RecoveredTab|null> {
+    async recoverTab (token: RecoveryToken): Promise<RecoveredTab|null> {
-        for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
+        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
+                    tab.options.title = token.tabTitle || ''
                     return tab
                 }
             } catch (error) {

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

@@ -8,7 +8,7 @@ export type TabComponentType = new (...args: any[]) => BaseTabComponent
 @Injectable({ providedIn: 'root' })
 export class TabsService {
     /** @hidden */
-    constructor (
+    private constructor (
         private componentFactoryResolver: ComponentFactoryResolver,
         private injector: Injector,
         private tabRecovery: TabRecoveryService,
@@ -17,12 +17,12 @@ export class TabsService {
     /**
      * Instantiates a tab component and assigns given inputs
      */
-    create (type: TabComponentType, inputs?: any): BaseTabComponent {
+    create (type: TabComponentType, inputs?: Record<string, any>): BaseTabComponent {
         const componentFactory = this.componentFactoryResolver.resolveComponentFactory(type)
         const componentRef = componentFactory.create(this.injector)
         const tab = componentRef.instance
         tab.hostView = componentRef.hostView
-        Object.assign(tab, inputs || {})
+        Object.assign(tab, inputs ?? {})
         return tab
     }