Merge branch 'master' of github.com:Eugeny/terminus

This reverts commit 9c6f2747aa.

app/lib/app.ts

@@ -1,4 +1,5 @@
 import { app, ipcMain, Menu, Tray, shell } from 'electron'
+import { loadConfig } from './config'
 import { Window } from './window'
 
 export class Application {
@@ -9,6 +10,14 @@ export class Application {
         ipcMain.on('app:config-change', () => {
             this.broadcast('host:config-change')
         })
+
+        const configData = loadConfig()
+        if (process.platform === 'linux' && ((configData.appearance || {}).opacity || 1) !== 1) {
+            app.commandLine.appendSwitch('enable-transparent-visuals')
+            app.disableHardwareAcceleration()
+        }
+
+        app.commandLine.appendSwitch('disable-http-cache')
     }
 
     async newWindow (): Promise<Window> {

app/lib/config.ts

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

app/lib/index.ts

@@ -11,8 +11,6 @@ if (!process.env.TERMINUS_PLUGINS) {
 
 const application = new Application()
 
-app.commandLine.appendSwitch('disable-http-cache')
-
 ipcMain.on('app:new-window', () => {
     console.log('new-window')
     application.newWindow()

app/lib/window.ts

@@ -1,33 +1,30 @@
 import { Subject, Observable } from 'rxjs'
-import { BrowserWindow, app, ipcMain, Rectangle, Menu } from 'electron'
+import { BrowserWindow, app, ipcMain, Rectangle } from 'electron'
 import ElectronConfig = require('electron-config')
-import * as yaml from 'js-yaml'
+import * as os from 'os'
-import * as fs from 'fs'
-import * as path from 'path'
 
-let electronVibrancy: any
+import { loadConfig } from './config'
-if (process.platform !== 'linux') {
+
-    electronVibrancy = require('electron-vibrancy')
+let SetWindowCompositionAttribute: any
+let AccentState: any
+let DwmEnableBlurBehindWindow: any
+if (process.platform === 'win32') {
+    SetWindowCompositionAttribute = require('windows-swca').SetWindowCompositionAttribute
+    AccentState = require('windows-swca').AccentState
+    DwmEnableBlurBehindWindow = require('windows-blurbehind').DwmEnableBlurBehindWindow
 }
 
 export class Window {
     ready: Promise<void>
     private visible = new Subject<boolean>()
     private window: BrowserWindow
-    private vibrancyViewID: number
     private windowConfig: ElectronConfig
     private windowBounds: Rectangle
 
     get visible$ (): Observable<boolean> { return this.visible }
 
     constructor () {
-        let configPath = path.join(app.getPath('userData'), 'config.yaml')
+        let configData = loadConfig()
-        let configData
-        if (fs.existsSync(configPath)) {
-            configData = yaml.safeLoad(fs.readFileSync(configPath, 'utf8'))
-        } else {
-            configData = {}
-        }
 
         this.windowConfig = new ElectronConfig({ name: 'window' })
         this.windowBounds = this.windowConfig.get('windowBoundaries')
@@ -42,6 +39,7 @@ export class Window {
             webPreferences: { webSecurity: false },
             frame: false,
             show: false,
+            backgroundColor: '#00000000'
         }
         Object.assign(options, this.windowBounds)
 
@@ -53,10 +51,6 @@ export class Window {
             }
         }
 
-        if (process.platform === 'win32' && (configData.appearance || {}).vibrancy) {
-            options.transparent = true
-        }
-
         if (process.platform === 'linux') {
             options.backgroundColor = '#131d27'
         }
@@ -95,11 +89,22 @@ export class Window {
     }
 
     setVibrancy (enabled: boolean) {
-        if (enabled && !this.vibrancyViewID) {
+        if (process.platform === 'win32') {
-            this.vibrancyViewID = electronVibrancy.SetVibrancy(this.window, 0)
+            if (parseFloat(os.release()) >= 10) {
-        } else if (!enabled && this.vibrancyViewID) {
+                let attribValue = AccentState.ACCENT_DISABLED
-            electronVibrancy.RemoveView(this.window, this.vibrancyViewID)
+                let color = 0x00000000
-            this.vibrancyViewID = null
+                if (enabled) {
+                    if (parseInt(os.release().split('.')[2]) >= 17063) {
+                        attribValue = AccentState.ACCENT_ENABLE_FLUENT
+                        color = 0x01000000 // using a small alpha because acrylic bugs out at full transparency.
+                    } else {
+                        attribValue = AccentState.ACCENT_ENABLE_BLURBEHIND
+                    }
+                }
+                SetWindowCompositionAttribute(this.window, attribValue, color)
+            } else {
+                DwmEnableBlurBehindWindow(this.window, enabled)
+            }
         }
     }
 
@@ -188,10 +193,6 @@ export class Window {
         ipcMain.on('window-set-title', (_event, title) => {
             this.window.setTitle(title)
         })
-
-        ipcMain.on('window-popup-context-menu', (_event, menuDefinition) => {
-            Menu.buildFromTemplate(menuDefinition).popup({ window: this.window })
-        })
     }
 
     private destroy () {

app/package.json

@@ -25,7 +25,6 @@
     "electron-debug": "^2.0.0",
     "electron-is-dev": "0.1.2",
     "electron-squirrel-startup": "^1.0.0",
-    "electron-vibrancy": "^0.1.3",
     "js-yaml": "3.8.2",
     "mz": "^2.6.0",
     "ngx-toastr": "^8.7.3",
@@ -34,6 +33,10 @@
     "yargs": "^12.0.1",
     "zone.js": "~0.8.26"
   },
+  "optionalDependencies": {
+    "windows-blurbehind": "^1.0.0",
+    "windows-swca": "^1.1.1"
+  },
   "devDependencies": {
     "@types/mz": "0.0.31"
   }

app/webpack.main.config.js

@@ -41,6 +41,8 @@ module.exports = {
     mz: 'commonjs mz',
     path: 'commonjs path',
     yargs: 'commonjs yargs',
+    'windows-swca': 'commonjs windows-swca',
+    'windows-blurbehind': 'commonjs windows-blurbehind',
   },
   plugins: [
     new webpack.optimize.ModuleConcatenationPlugin(),

app/yarn.lock

@@ -80,10 +80,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-bindings@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
-
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -183,13 +179,6 @@ electron-squirrel-startup@^1.0.0:
   dependencies:
     debug "^2.2.0"
 
-electron-vibrancy@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/electron-vibrancy/-/electron-vibrancy-0.1.3.tgz#04382dd6e030e5ca5e60f8e024033738cb8479e3"
-  dependencies:
-    bindings "^1.2.1"
-    nan "^2.0.5"
-
 env-paths@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-0.3.1.tgz#c30ccfcbc30c890943dc08a85582517ef00da463"
@@ -336,10 +325,6 @@ mz@^2.6.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.0.5:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-
 ngx-toastr@^8.7.3:
   version "8.7.3"
   resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-8.7.3.tgz#d3b7a8077ba1c860dd8a44779ccad38c5ea15c92"
@@ -532,6 +517,14 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+windows-blurbehind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.0.tgz#050efb988704c44335bdc3efefd757f6e463b8ac"
+
+windows-swca@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-1.1.1.tgz#0b3530278c67d408baac71c3a6aeb16d55318bf8"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"

appveyor.yml

@@ -4,7 +4,7 @@ platform:
   - x64
 
 environment:
-  nodejs_version: "7"
+  nodejs_version: "10"
 
 cache:
   - '%USERPROFILE%\.electron'

build/linux/after-install.tpl

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Link to the binary
+ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'

package.json

@@ -120,7 +120,8 @@
         "libxtst6",
         "libnss3",
         "tmux"
-      ]
+      ],
+      "afterInstall": "build/linux/after-install.tpl"
     },
     "rpm": {
       "depends": [

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { TouchBar, BrowserWindow } from 'electron'
+import { TouchBar, BrowserWindow, Menu } from 'electron'
 
 @Injectable()
 export class ElectronService {
@@ -14,6 +14,7 @@ export class ElectronService {
     remote: any
     TouchBar: typeof TouchBar
     BrowserWindow: typeof BrowserWindow
+    Menu: typeof Menu
     private electron: any
 
     constructor () {
@@ -29,6 +30,7 @@ export class ElectronService {
         this.nativeImage = this.remote.nativeImage
         this.TouchBar = this.remote.TouchBar
         this.BrowserWindow = this.remote.BrowserWindow
+        this.Menu = this.remote.Menu
     }
 
     remoteRequire (name: string): any {

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

@@ -169,7 +169,7 @@ export class HostAppService {
     }
 
     popupContextMenu (menuDefinition: Electron.MenuItemConstructorOptions[]) {
-        this.electron.ipcRenderer.send('window-popup-context-menu', menuDefinition)
+        this.electron.Menu.buildFromTemplate(menuDefinition).popup({})
     }
 
     broadcastConfigChange () {

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

@@ -38,6 +38,16 @@ export class ShellIntegrationService {
             )
             this.automatorWorkflowsDestination = path.join(process.env.HOME, 'Library', 'Services')
         }
+        this.updatePaths()
+    }
+
+    async updatePaths (): Promise<void> {
+        // Update paths in case of an update
+        if (this.hostApp.platform === Platform.Windows) {
+            if (await this.isInstalled()) {
+                await this.install()
+            }
+        }
     }
 
     async isInstalled (): Promise<boolean> {

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

@@ -66,7 +66,7 @@ div(*ngIf='npmInstalled')
                 i.fa.fa-fw.fa-search(*ngIf='availablePluginsReady')
         input.form-control(
             type='text',
-            '[(ngModel)]'='_1',
+            [(ngModel)]='_1',
             (ngModelChange)='searchAvailable(_1)',
             placeholder='Search plugins'
         )

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

@@ -72,9 +72,13 @@ export class PluginManagerService {
 
     listAvailable (query?: string): Observable<IPluginInfo[]> {
         return from(
-            axios.get(`https://api.npms.io/v2/search?q=keywords%3A${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=250`, {})
+            axios.get(`https://www.npmjs.com/search?q=keywords%3A${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=1000`, {
+                headers: {
+                    'x-spiferack': '1',
+                }
+            })
         ).pipe(
-            map(response => response.data.results.map(item => ({
+            map(response => response.data.objects.map(item => ({
                 name: item.package.name.substring(NAME_PREFIX.length),
                 packageName: item.package.name,
                 description: item.package.description,

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

@@ -64,33 +64,18 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                     .title Vibrancy
                     .description Gives the window a blurred transparent background
                     
-                .btn-group(
+                toggle(
                     [(ngModel)]='config.store.appearance.vibrancy',
-                    (ngModelChange)='config.save(); (hostApp.platform === Platform.Windows && config.requestRestart())',
+                    (ngModelChange)='config.save()'
-                    ngbRadioGroup
                 )
-                    label.btn.btn-secondary(ngbButtonLabel)
-                        input(
-                            type='radio',
-                            ngbButton,
-                            [value]='true'
-                        )
-                        | Enable
-                    label.btn.btn-secondary(ngbButtonLabel)
-                        input(
-                            type='radio',
-                            ngbButton,
-                            [value]='false'
-                        )
-                        | Disable
 
-            .form-line(*ngIf='hostApp.platform !== Platform.Linux')
+            .form-line
                 .header
                     .title Window opacity
                 input(
                     type='range',
                     [(ngModel)]='config.store.appearance.opacity',
-                    (ngModelChange)='config.save()',
+                    (ngModelChange)='config.save(); (hostApp.platform === Platform.Linux && config.requestRestart())',
                     min='0.05',
                     max='1',
                     step='0.01'
@@ -259,8 +244,8 @@ ngb-tabset.vertical(type='pills', [activeId]='activeTab')
                         td {{hotkey.id}}
                         td
                             multi-hotkey-input(
-                                '[(model)]'='config.store.hotkeys[hotkey.id]'
+                                [(model)]='config.store.hotkeys[hotkey.id]',
-                                '(modelChange)'='config.save(); docking.dock()'
+                                (modelChange)='config.save(); docking.dock()'
                             )
 
     ngb-tab(*ngFor='let provider of settingsProviders', [id]='provider.id')

terminus-ssh/src/api.ts

@@ -3,6 +3,8 @@ import { BaseSession } from 'terminus-terminal'
 export interface LoginScript {
     expect?: string
     send: string
+    isRegex?: boolean
+    optional?: boolean
 }
 
 export interface SSHConnection {
@@ -37,15 +39,37 @@ export class SSHSession extends BaseSession {
             if (this.scripts) {
                 let found = false
                 for (let script of this.scripts) {
-                    if (dataString.includes(script.expect)) {
+                    let match = false
-                        console.log('Executing script:', script.send)
+                    let cmd = ''
-                        this.shell.write(script.send + '\n')
+                    if (script.isRegex) {
-                        this.scripts = this.scripts.filter(x => x !== script)
+                        let re = new RegExp(script.expect, 'g')
+                        if (dataString.match(re)) {
+                            cmd = dataString.replace(re, script.send)
+                            match = true
                             found = true
+                        }
+                    } else {
+                        if (dataString.includes(script.expect)) {
+                            cmd = script.send
+                            match = true
+                            found = true
+                        }
+                    }
+
+                    if (match) {
+                        console.log('Executing script: "' + cmd + '"')
+                        this.shell.write(cmd + '\n')
+                        this.scripts = this.scripts.filter(x => x !== script)
+                    } else {
+                        if (script.optional) {
+                            console.log('Skip optional script: ' + script.expect)
+                            found = true
+                            this.scripts = this.scripts.filter(x => x !== script)
                         } else {
                             break
                         }
                     }
+                }
 
                 if (found) {
                     this.executeUnconditionalScripts()

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

@@ -94,6 +94,8 @@
                     tr
                         th String to expect
                         th String to be sent
+                        th Regex
+                        th Optional
                         th Actions
                     tr(*ngFor='let script of connection.scripts')
                         td
@@ -106,6 +108,14 @@
                                 type='text', 
                                 [(ngModel)]='script.send'
                             )
+                        td
+                            toggle(
+                                [(ngModel)]='script.isRegex',
+                            )
+                        td
+                            toggle(
+                                [(ngModel)]='script.optional',
+                            )
                         td
                             .input-group.flex-nowrap
                                 button.btn.btn-outline-info.ml-0((click)='moveScriptUp(script)')
@@ -127,6 +137,14 @@
                                 placeholder='Enter a string to be sent', 
                                 [(ngModel)]='newScript.send'
                             )
+                        td
+                            toggle(
+                                [(ngModel)]='newScript.isRegex',
+                            )
+                        td
+                            toggle(
+                                [(ngModel)]='newScript.optional',
+                            )
                         td
                             .input-group.flex-nowrap
                                 button.btn.btn-outline-info.ml-0((click)='addScript()')

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

@@ -83,5 +83,7 @@ export class EditConnectionModalComponent {
     clearScript () {
         this.newScript.expect = ''
         this.newScript.send = ''
+        this.newScript.isRegex = false
+        this.newScript.optional = false
     }
 }

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

@@ -3,7 +3,7 @@ ng-template(#content)
         [style.width]='"100%"',
         [style.background]='model',
     )
-    input.form-control(type='text', '[(ngModel)]'='model', (ngModelChange)='onChange()', #input)
+    input.form-control(type='text', [(ngModel)]='model', (ngModelChange)='onChange()', #input)
 
 div(
     [ngbPopover]='content',

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

@@ -70,23 +70,23 @@ h3.mb-3 Appearance
 
         .form-group(*ngIf='editingColorScheme')
             color-picker(
-                '[(model)]'='editingColorScheme.foreground',
+                [(model)]='editingColorScheme.foreground',
                 (modelChange)='config.save(); schemeChanged = true',
                 title='FG',
             )
             color-picker(
-                '[(model)]'='editingColorScheme.background',
+                [(model)]='editingColorScheme.background',
                 (modelChange)='config.save(); schemeChanged = true',
                 title='BG',
             )
             color-picker(
-                '[(model)]'='editingColorScheme.cursor',
+                [(model)]='editingColorScheme.cursor',
                 (modelChange)='config.save(); schemeChanged = true',
                 title='CU',
             )
             color-picker(
                 *ngFor='let _ of editingColorScheme.colors; let idx = index; trackBy: colorsTrackBy',
-                '[(model)]'='editingColorScheme.colors[idx]',
+                [(model)]='editingColorScheme.colors[idx]',
                 (modelChange)='config.save(); schemeChanged = true',
                 [title]='idx',
             )

terminus-terminal/src/frontends/xtermFrontend.ts

@@ -43,6 +43,10 @@ export class XTermFrontend extends Frontend {
 
         host.addEventListener('dragOver', (event: any) => this.dragOver.next(event))
         host.addEventListener('drop', event => this.drop.next(event))
+
+        host.addEventListener('mousedown', event => this.mouseEvent.next(event))
+        host.addEventListener('mouseup', event => this.mouseEvent.next(event))
+        host.addEventListener('mousewheel', event => this.mouseEvent.next(event))
     }
 
     detach (host: HTMLElement): void {

terminus-terminal/src/hterm.ts

@@ -57,8 +57,13 @@ hterm.hterm.Terminal.prototype.applyCursorShape = function () {
         console.warn('Unknown cursor style: ' + modeNumber)
         return
     }
+    setTimeout(() => {
         this.setCursorShape(modes[modeNumber][0])
         this.setCursorBlink(modes[modeNumber][1])
+    })
+    setTimeout(() => {
+        this.setCursorVisible(true)
+    })
 }
 
 hterm.hterm.VT.CSI[' q'] = function (parseState) {

terminus-terminal/src/shells/winDefault.ts

@@ -7,7 +7,6 @@ import { WSLShellProvider } from './wsl'
 import { PowerShellCoreShellProvider } from './powershellCore'
 import { WindowsStockShellsProvider } from './windowsStock'
 
-
 @Injectable()
 export class WindowsDefaultShellProvider extends ShellProvider {
     private providers: ShellProvider[]

terminus-terminal/src/shells/wsl.ts

@@ -18,11 +18,25 @@ export class WSLShellProvider extends ShellProvider {
             return []
         }
 
+        const bashPath = `${process.env.windir}\\system32\\bash.exe`
         const wslPath = `${process.env.windir}\\system32\\wsl.exe`
         const wslConfigPath = `${process.env.windir}\\system32\\wslconfig.exe`
+
         if (!await fs.exists(wslPath)) {
+            if (await fs.exists(bashPath)) {
+                return [{
+                    id: 'wsl',
+                    name: 'WSL / Bash on Windows',
+                    command: bashPath,
+                    env: {
+                        TERM: 'xterm-color',
+                        COLORTERM: 'truecolor',
+                    }
+                }]
+            } else {
                 return []
             }
+        }
 
         let lines = (await exec(`${wslConfigPath} /l`, { encoding: 'ucs2' }))[0].toString().split('\n').splice(1)
         let shells: IShell[] = [{