SFTP filter bar (#10590)

HACKING.md

@@ -60,7 +60,7 @@ tabby
 |  ├─ src                               # Electron renderer code
 |  └─ main.js                           # Electron main entry point
 ├─ build
-├─ clink                                # Clink distributive, for Windows
+├─ clink                                # Clink distribution, for Windows
 ├─ scripts                              # Maintenance scripts
 ├─ tabby-community-color-schemes     # Plugin that provides color schemes
 ├─ tabby-core                        # Plugin that provides base UI and tab management

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Eugene Pankov
+Copyright (c) 2017 Tabby Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.de-DE.md

@@ -349,7 +349,6 @@ Dank geht an diese wunderbaren Menschen ([emoji key](https://allcontributors.org
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loopx9"><img src="https://avatars.githubusercontent.com/u/46422475?v=4?s=100" width="100px;" alt="loopx9"/><br /><sub><b>loopx9</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=loopx9" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.it-IT.md

@@ -343,7 +343,6 @@ Grazie a queste persone meravigliose ([emoji key](https://allcontributors.org/do
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loopx9"><img src="https://avatars.githubusercontent.com/u/46422475?v=4?s=100" width="100px;" alt="loopx9"/><br /><sub><b>loopx9</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=loopx9" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.ko-KR.md

@@ -107,7 +107,7 @@ This README is also available in: <a  href="./README.md">:gb: English</a> · <a
 
 플러그인과 테마는 Tabby 내부의 설정에서 직접 설치할 수 있습니다.
 
-* [clickable-links](https://github.com/Eugeny/tabby-clickable-links) - m터미널의 경로 및 URL을 클릭 가능하게
+* [clickable-links](https://github.com/Eugeny/tabby-clickable-links) - 터미널의 경로 및 URL을 클릭 가능하게
 * [docker](https://github.com/Eugeny/tabby-docker) - Docker 컨테이너에 연결
 * [title-control](https://github.com/kbjr/terminus-title-control) - 접두사, 접미사 및/또는 문자열 제거를 제공하여 터미널 탭의 제목을 수정
 * [quick-cmds](https://github.com/Domain/terminus-quick-cmds) - 하나 또는 모든 터미널 탭에 신속한 명령 전송
@@ -144,7 +144,7 @@ Pull requests and plugins are welcome!
 ---
 <a name="contributors"></a>
 
-여기있는 멋진 사람들에게 진심으로 감사합니다. ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+여기 있는 멋진 사람들에게 진심으로 감사합니다. ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
@@ -342,7 +342,6 @@ Pull requests and plugins are welcome!
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loopx9"><img src="https://avatars.githubusercontent.com/u/46422475?v=4?s=100" width="100px;" alt="loopx9"/><br /><sub><b>loopx9</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=loopx9" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.md

@@ -366,7 +366,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loopx9"><img src="https://avatars.githubusercontent.com/u/46422475?v=4?s=100" width="100px;" alt="loopx9"/><br /><sub><b>loopx9</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=loopx9" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.ru-RU.md

@@ -343,7 +343,6 @@ Pull-запросы и плагины приветствуются!
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loopx9"><img src="https://avatars.githubusercontent.com/u/46422475?v=4?s=100" width="100px;" alt="loopx9"/><br /><sub><b>loopx9</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=loopx9" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.zh-CN.md

@@ -342,7 +342,6 @@
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/geodic"><img src="https://avatars.githubusercontent.com/u/64704703?v=4?s=100" width="100px;" alt="geodic"/><br /><sub><b>geodic</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=geodic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loopx9"><img src="https://avatars.githubusercontent.com/u/46422475?v=4?s=100" width="100px;" alt="loopx9"/><br /><sub><b>loopx9</b></sub></a><br /><a href="https://github.com/Eugeny/tabby/commits?author=loopx9" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

app/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "repository": "https://github.com/Eugeny/tabby",
   "author": {
-    "name": "Eugene Pankov",
+    "name": "Tabby Developers",
     "email": "e@ajenti.org"
   },
   "main": "dist/main.js",

app/src/pluginBlacklist.ts

@@ -6,4 +6,6 @@ export const PLUGIN_BLACKLIST = [
     'terminus-clickable-ips', // broken, functionality now bundled with Tabby
     'terminus-elastic-quick-commands', // broken and abandoned, fork of quick-commands
     'terminus-elastic-quick-cmds', // broken and abandoned, fork of quick-commands
+    'tabby-fig', // abandoned,
+    'tabby-plugin-fig-integration', // abandoned,
 ]

package.json

@@ -40,7 +40,7 @@
     "cross-env": "7.0.3",
     "css-loader": "^6.7.3",
     "deep-equal": "2.0.5",
-    "electron": "^36.3",
+    "electron": "^36.4",
     "electron-builder": "^26.0",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",

scripts/vars.mjs

@@ -31,6 +31,7 @@ export const builtinPlugins = [
     'tabby-electron',
     'tabby-plugin-manager',
     'tabby-linkifier',
+    'tabby-auto-sudo-password',
 ]
 
 export const packagesWithDocs = [

tabby-auto-sudo-password/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "tabby-auto-sudo-password",
+  "version": "1.0.197-nightly.1",
+  "description": "Offers to automatically paste saved sudo password in SSH sessions",
+  "keywords": [
+    "tabby-builtin-plugin"
+  ],
+  "main": "dist/index.js",
+  "typings": "typings/index.d.ts",
+  "scripts": {
+    "build": "webpack --progress --color --display-modules",
+    "watch": "webpack --progress --color --watch"
+  },
+  "files": [
+    "dist",
+    "typings"
+  ],
+  "devDependencies": {
+    "ansi-colors": "^4.1.1"
+  },
+  "author": "Tabby Developers",
+  "license": "MIT"
+}

tabby-auto-sudo-password/src/decorator.ts

@@ -0,0 +1,89 @@
+import colors from 'ansi-colors'
+import { Injectable } from '@angular/core'
+import { TerminalDecorator, BaseTerminalTabComponent, XTermFrontend, SessionMiddleware } from 'tabby-terminal'
+import { SSHProfile, SSHTabComponent, PasswordStorageService } from 'tabby-ssh'
+
+const SUDO_PROMPT_REGEX = /^\[sudo\] password for ([^:]+):\s*$/im
+
+export class AutoSudoPasswordMiddleware extends SessionMiddleware {
+    private pendingPasswordToPaste: string | null = null
+    private pasteHint = `${colors.black.bgBlackBright(' Tabby ')} ${colors.gray('Press Enter to paste saved password')}`
+    private pasteHintLength = colors.stripColor(this.pasteHint).length
+
+    constructor (
+        private profile: SSHProfile,
+        private ps: PasswordStorageService,
+    ) { super() }
+
+    feedFromSession (data: Buffer): void {
+        const text = data.toString('utf-8')
+        const match = SUDO_PROMPT_REGEX.exec(text)
+        if (match) {
+            const username = match[1]
+            this.handlePrompt(username)
+        }
+        this.outputToTerminal.next(data)
+    }
+
+    feedFromTerminal (data: Buffer): void {
+        if (this.pendingPasswordToPaste) {
+            const backspaces = Buffer.alloc(this.pasteHintLength, 8) // backspace
+            const spaces = Buffer.alloc(this.pasteHintLength, 32) // space
+            const clear = Buffer.concat([backspaces, spaces, backspaces])
+            this.outputToTerminal.next(clear)
+            if (data.length === 1 && data[0] === 13) { // Enter key
+                this.outputToSession.next(Buffer.from(this.pendingPasswordToPaste + '\n'))
+                this.pendingPasswordToPaste = null
+                return
+            } else {
+                this.pendingPasswordToPaste = null
+            }
+        }
+        this.outputToSession.next(data)
+    }
+
+    async handlePrompt (username: string): Promise<void> {
+        console.log(`Detected sudo prompt for user: ${username}`)
+        const pw = await this.ps.loadPassword(this.profile)
+        if (pw) {
+            this.outputToTerminal.next(Buffer.from(this.pasteHint))
+            this.pendingPasswordToPaste = pw
+        }
+    }
+
+    async loadPassword (username: string): Promise<string| null> {
+        if (this.profile.options.user !== username) {
+            return null
+        }
+        return this.ps.loadPassword(this.profile)
+    }
+}
+
+@Injectable()
+export class AutoSudoPasswordDecorator extends TerminalDecorator {
+    constructor (
+        private ps: PasswordStorageService,
+    ) {
+        super()
+    }
+
+    private attachToSession (tab: SSHTabComponent) {
+        if (!tab.session) {
+            return
+        }
+        tab.session.middleware.unshift(new AutoSudoPasswordMiddleware(tab.profile, this.ps))
+    }
+
+    attach (tab: BaseTerminalTabComponent<any>): void {
+        if (!(tab.frontend instanceof XTermFrontend) || !(tab instanceof SSHTabComponent)) {
+            return
+        }
+
+        setTimeout(() => {
+            this.attachToSession(tab)
+            this.subscribeUntilDetached(tab, tab.sessionChanged$.subscribe(() => {
+                this.attachToSession(tab)
+            }))
+        })
+    }
+}

tabby-auto-sudo-password/src/index.ts

@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-extraneous-class */
+import { NgModule } from '@angular/core'
+import { ToastrModule } from 'ngx-toastr'
+import { TerminalDecorator } from 'tabby-terminal'
+
+import { AutoSudoPasswordDecorator } from './decorator'
+
+@NgModule({
+    imports: [
+        ToastrModule,
+    ],
+    providers: [
+        { provide: TerminalDecorator, useClass: AutoSudoPasswordDecorator, multi: true },
+    ],
+})
+export default class AutoSudoPasswordModule { }

tabby-auto-sudo-password/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.json",
+  "exclude": ["node_modules", "dist"],
+  "compilerOptions": {
+    "baseUrl": "src",
+  }
+}

tabby-auto-sudo-password/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": {
+      "tabby-*": ["../../tabby-*"],
+      "*": ["../../app/node_modules/*"]
+    }
+  }
+}

tabby-auto-sudo-password/webpack.config.mjs

@@ -0,0 +1,10 @@
+import * as path from 'path'
+import * as url from 'url'
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
+
+import config from '../webpack.plugin.config.mjs'
+
+export default () => config({
+    name: 'auto-sudo-password',
+    dirname: __dirname,
+})

tabby-auto-sudo-password/yarn.lock

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+ansi-colors@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==

tabby-community-color-schemes/package.json

@@ -14,7 +14,7 @@
   "files": [
     "dist"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "peerDependencies": {
     "@angular/core": "^15",

tabby-core/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "bootstrap": "^5.3.0-alpha.1",

tabby-core/src/api/index.ts

@@ -10,7 +10,7 @@ export { Theme } from './theme'
 export { TabContextMenuItemProvider } from './tabContextMenuProvider'
 export { SelectorOption } from './selector'
 export { CLIHandler, CLIEvent } from './cli'
-export { PlatformService, ClipboardContent, MessageBoxResult, MessageBoxOptions, FileDownload, FileUpload, FileTransfer, HTMLFileUpload, FileUploadOptions, DirectoryUpload } from './platform'
+export { PlatformService, ClipboardContent, MessageBoxResult, MessageBoxOptions, FileDownload, FileUpload, FileTransfer, HTMLFileUpload, FileUploadOptions, DirectoryUpload, DirectoryDownload, PlatformTheme } from './platform'
 export { MenuItemOptions } from './menu'
 export { BootstrapData, PluginInfo, BOOTSTRAP_DATA } from './mainProcess'
 export { HostWindowService } from './hostWindow'

tabby-core/src/api/platform.ts

@@ -22,7 +22,6 @@ export interface MessageBoxResult {
 
 export abstract class FileTransfer {
     abstract getName (): string
-    abstract getMode (): number
     abstract getSize (): number
     abstract close (): void
 
@@ -34,8 +33,16 @@ export abstract class FileTransfer {
         return this.completedBytes
     }
 
+    getStatus (): string {
+        return this.status
+    }
+
+    getTotalSize (): number {
+        return this.totalSize
+    }
+
     isComplete (): boolean {
-        return this.completedBytes >= this.getSize()
+        return this.completed
     }
 
     isCancelled (): boolean {
@@ -47,6 +54,18 @@ export abstract class FileTransfer {
         this.close()
     }
 
+    setStatus (status: string): void {
+        this.status = status
+    }
+
+    setTotalSize (size: number): void {
+        this.totalSize = size
+    }
+
+    setCompleted (completed: boolean): void {
+        this.completed = completed
+    }
+
     protected increaseProgress (bytes: number): void {
         if (!bytes) {
             return
@@ -57,16 +76,26 @@ export abstract class FileTransfer {
     }
 
     private completedBytes = 0
+    private totalSize = 0
     private lastChunkStartTime = Date.now()
     private lastChunkSpeed = 0
     private cancelled = false
+    private completed = false
+    private status = ''
 }
 
 export abstract class FileDownload extends FileTransfer {
     abstract write (buffer: Uint8Array): Promise<void>
 }
 
+export abstract class DirectoryDownload extends FileTransfer {
+    abstract createDirectory (relativePath: string): Promise<void>
+    abstract createFile (relativePath: string, mode: number, size: number): Promise<FileDownload>
+}
+
 export abstract class FileUpload extends FileTransfer {
+    abstract getMode (): number
+
     abstract read (): Promise<Uint8Array>
 
     async readAll (): Promise<Uint8Array> {
@@ -127,6 +156,7 @@ export abstract class PlatformService {
     abstract saveConfig (content: string): Promise<void>
 
     abstract startDownload (name: string, mode: number, size: number): Promise<FileDownload|null>
+    abstract startDownloadDirectory (name: string, estimatedSize?: number): Promise<DirectoryDownload|null>
     abstract startUpload (options?: FileUploadOptions): Promise<FileUpload[]>
     abstract startUploadDirectory (paths?: string[]): Promise<DirectoryUpload>
 
@@ -237,7 +267,7 @@ export abstract class PlatformService {
     abstract setErrorHandler (handler: (_: any) => void): void
     abstract popupContextMenu (menu: MenuItemOptions[], event?: MouseEvent): void
     abstract showMessageBox (options: MessageBoxOptions): Promise<MessageBoxResult>
-    abstract pickDirectory (): Promise<string>
+    abstract pickDirectory (): Promise<string | null>
     abstract quit (): void
 }
 

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

@@ -35,7 +35,8 @@ title-bar(
                 [@animateTab]='{value: "in", params: {size: targetTabSize}}',
                 [@.disabled]='hasVerticalTabs() || !config.store.accessibility.animations',
                 (click)='app.selectTab(tab)',
-                [class.fully-draggable]='hostApp.platform !== Platform.macOS'
+                [class.fully-draggable]='hostApp.platform !== Platform.macOS',
+                [ngbTooltip]='tab.customTitle || tab.title'
             )
 
         .btn-group.background
@@ -43,7 +44,7 @@ title-bar(
                 *ngFor='let button of leftToolbarButtons'
             )
                 button.btn.btn-secondary.btn-tab-bar(
-                    [title]='button.label',
+                    [ngbTooltip]='button.label',
                     (click)='button.run && button.run()',
                     [fastHtmlBind]='button.icon'
                 )
@@ -55,7 +56,7 @@ title-bar(
             )
                 button.btn.btn-secondary.btn-tab-bar(
                     [hidden]='activeTransfers.length == 0',
-                    title='File transfers',
+                    [ngbTooltip]='"File transfers"|translate',
                     ngbDropdownToggle
                 ) !{require('../icons/transfers.svg')}
                 transfers-menu(
@@ -75,14 +76,14 @@ title-bar(
                 *ngFor='let button of rightToolbarButtons'
             )
                 button.btn.btn-secondary.btn-tab-bar(
-                    [title]='button.label',
+                    [ngbTooltip]='button.label',
                     (click)='button.run && button.run()',
                     [fastHtmlBind]='button.icon'
                 )
 
             button.btn.btn-secondary.btn-tab-bar.btn-update(
                 *ngIf='updatesAvailable',
-                title='Update available - Click to install',
+                [ngbTooltip]='"Update available - Click to install"|translate',
                 (click)='updater.update()'
             ) !{require('../icons/gift.svg')}
 

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

@@ -13,7 +13,6 @@ profile-icon(
 )
 
 .name(
-    [title]='tab.customTitle || tab.title',
     [class.no-hover]='config.store.terminal.hideCloseButton && config.store.terminal.hideTabOptionsButton'
     cdkDrag,
     cdkDragRootElement='tab-header',

tabby-core/src/components/transfersMenu.component.pug

@@ -5,7 +5,9 @@
     .icon(*ngIf='isDownload(transfer)') !{require('../icons/download.svg')}
     .icon(*ngIf='!isDownload(transfer)') !{require('../icons/upload.svg')}
     .main
-        label.no-wrap([title]='transfer.getName()') {{transfer.getName()}}
+        label.no-wrap([ngbTooltip]='transfer.getName()')
+            | {{transfer.getName()}}
+            span.ms-2.text-muted(*ngIf='transfer.getStatus()') ({{transfer.getStatus()}})
         ngb-progressbar([type]='transfer.isComplete() ? "success" : transfer.isCancelled() ? "danger" : "info"', [value]='getProgress(transfer)')
         .metadata
             .size {{transfer.getSize()|filesize}}

tabby-core/src/index.ts

@@ -2,7 +2,7 @@ import { NgModule, ModuleWithProviders, LOCALE_ID } from '@angular/core'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { CommonModule } from '@angular/common'
 import { FormsModule } from '@angular/forms'
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import { NgbModule, NgbTooltipConfig } from '@ng-bootstrap/ng-bootstrap'
 import { NgxFilesizeModule } from 'ngx-filesize'
 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { TranslateModule, TranslateCompiler, TranslateService, MissingTranslationHandler } from '@ngx-translate/core'
@@ -155,6 +155,7 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
         platform: PlatformService,
         hotkeys: HotkeysService,
         commands: CommandService,
+        ngbTooltipConfig: NgbTooltipConfig,
         public locale: LocaleService,
         private translate: TranslateService,
         private profilesService: ProfilesService,
@@ -201,6 +202,10 @@ export default class AppModule { // eslint-disable-line @typescript-eslint/no-ex
                 commands.run('core:profile-selector', {})
             }
         })
+
+        ngbTooltipConfig.openDelay = 750
+        ngbTooltipConfig.placement = 'top bottom auto'
+        ngbTooltipConfig.container = 'body'
     }
 
     async showSelector (provider: ProfileProvider<Profile>): Promise<void> {

tabby-electron/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "peerDependencies": {
     "@angular/core": "^15",

tabby-electron/src/services/platform.service.ts

@@ -5,12 +5,11 @@ import * as os from 'os'
 import promiseIpc, { RendererProcessType } from 'electron-promise-ipc'
 import { execFile } from 'mz/child_process'
 import { Injectable, NgZone } from '@angular/core'
-import { PlatformService, ClipboardContent, Platform, MenuItemOptions, MessageBoxOptions, MessageBoxResult, DirectoryUpload, FileUpload, FileDownload, FileUploadOptions, wrapPromise, TranslateService } from 'tabby-core'
+import { PlatformService, ClipboardContent, Platform, MenuItemOptions, MessageBoxOptions, MessageBoxResult, DirectoryUpload, FileUpload, FileDownload, DirectoryDownload, FileUploadOptions, wrapPromise, TranslateService, FileTransfer, PlatformTheme } from 'tabby-core'
 import { ElectronService } from '../services/electron.service'
 import { ElectronHostWindow } from './hostWindow.service'
 import { ShellIntegrationService } from './shellIntegration.service'
 import { ElectronHostAppService } from './hostApp.service'
-import { PlatformTheme } from '../../../tabby-core/src/api/platform'
 import { configPath } from '../../../app/lib/config'
 const fontManager = require('fontmanager-redux') // eslint-disable-line
 
@@ -272,19 +271,48 @@ export class ElectronPlatformService extends PlatformService {
         return transfer
     }
 
+    async startDownloadDirectory (name: string, estimatedSize?: number): Promise<DirectoryDownload|null> {
+        const selectedFolder = await this.pickDirectory(this.translate.instant('Select destination folder for {name}', { name }), this.translate.instant('Download here'))
+        if (!selectedFolder) {
+            return null
+        }
+
+        let downloadPath = path.join(selectedFolder, name)
+        let counter = 1
+        while (fsSync.existsSync(downloadPath)) {
+            downloadPath = path.join(selectedFolder, `${name} (${counter})`)
+            counter++
+        }
+
+        const transfer = new ElectronDirectoryDownload(downloadPath, name, estimatedSize ?? 0, this.electron, this.zone)
+        await wrapPromise(this.zone, transfer.open())
+        this.fileTransferStarted.next(transfer)
+        return transfer
+    }
+
+    _registerFileTransfer (transfer: FileTransfer): void {
+        this.fileTransferStarted.next(transfer)
+    }
+
     setErrorHandler (handler: (_: any) => void): void {
         this.electron.ipcRenderer.on('uncaughtException', (_$event, err) => {
             handler(err)
         })
     }
 
-    async pickDirectory (): Promise<string> {
-        return (await this.electron.dialog.showOpenDialog(
+    async pickDirectory (title?: string, buttonLabel?: string): Promise<string | null> {
+        const result = await this.electron.dialog.showOpenDialog(
             this.hostWindow.getWindow(),
             {
+                title,
+                buttonLabel,
                 properties: ['openDirectory', 'showHiddenFiles'],
             },
-        )).filePaths[0]
+        )
+        if (result.canceled || !result.filePaths.length) {
+            return null
+        }
+        return result.filePaths[0]
     }
 
     getTheme (): PlatformTheme {
@@ -313,6 +341,7 @@ class ElectronFileUpload extends FileUpload {
         const stat = await fs.stat(this.filePath)
         this.size = stat.size
         this.mode = stat.mode
+        this.setTotalSize(this.size)
         this.file = await fs.open(this.filePath, 'r')
     }
 
@@ -331,6 +360,9 @@ class ElectronFileUpload extends FileUpload {
     async read (): Promise<Uint8Array> {
         const result = await this.file.read(this.buffer, 0, this.buffer.length, null)
         this.increaseProgress(result.bytesRead)
+        if (this.getCompletedBytes() >= this.getSize()) {
+            this.setCompleted(true)
+        }
         return this.buffer.slice(0, result.bytesRead)
     }
 
@@ -352,6 +384,7 @@ class ElectronFileDownload extends FileDownload {
     ) {
         super()
         this.powerSaveBlocker = electron.powerSaveBlocker.start('prevent-app-suspension')
+        this.setTotalSize(size)
     }
 
     async open (): Promise<void> {
@@ -362,10 +395,6 @@ class ElectronFileDownload extends FileDownload {
         return path.basename(this.filePath)
     }
 
-    getMode (): number {
-        return this.mode
-    }
-
     getSize (): number {
         return this.size
     }
@@ -377,6 +406,9 @@ class ElectronFileDownload extends FileDownload {
             this.increaseProgress(result.bytesWritten)
             pos += result.bytesWritten
         }
+        if (this.getCompletedBytes() >= this.getSize()) {
+            this.setCompleted(true)
+        }
     }
 
     close (): void {
@@ -384,3 +416,49 @@ class ElectronFileDownload extends FileDownload {
         this.file.close()
     }
 }
+
+class ElectronDirectoryDownload extends DirectoryDownload {
+    private powerSaveBlocker = 0
+
+    constructor (
+        private basePath: string,
+        private name: string,
+        estimatedSize: number,
+        private electron: ElectronService,
+        private zone: NgZone,
+    ) {
+        super()
+        this.powerSaveBlocker = electron.powerSaveBlocker.start('prevent-app-suspension')
+        this.setTotalSize(estimatedSize)
+    }
+
+    async open (): Promise<void> {
+        await fs.mkdir(this.basePath, { recursive: true })
+    }
+
+    getName (): string {
+        return this.name
+    }
+
+    getSize (): number {
+        return this.getTotalSize()
+    }
+
+    async createDirectory (relativePath: string): Promise<void> {
+        const fullPath = path.join(this.basePath, relativePath)
+        await fs.mkdir(fullPath, { recursive: true })
+    }
+
+    async createFile (relativePath: string, mode: number, size: number): Promise<FileDownload> {
+        const fullPath = path.join(this.basePath, relativePath)
+        await fs.mkdir(path.dirname(fullPath), { recursive: true })
+
+        const fileDownload = new ElectronFileDownload(fullPath, mode, size, this.electron)
+        await wrapPromise(this.zone, fileDownload.open())
+        return fileDownload
+    }
+
+    close (): void {
+        this.electron.powerSaveBlocker.stop(this.powerSaveBlocker)
+    }
+}

tabby-linkifier/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@xterm/addon-web-links": "^0.10.0",

tabby-local/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "ansi-colors": "^4.1.1",

tabby-local/src/components/localProfileSettings.component.ts

@@ -28,6 +28,10 @@ export class LocalProfileSettingsComponent implements ProfileSettingsComponent<L
         //     return
         // }
 
-        this.profile.options.cwd = await this.platform.pickDirectory()
+        const cwd = await this.platform.pickDirectory()
+        if (!cwd) {
+            return
+        }
+        this.profile.options.cwd = cwd
     }
 }

tabby-plugin-manager/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@types/semver": "^7.1.0",

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

@@ -100,6 +100,7 @@ export class PluginsSettingsTabComponent {
             this.busy.delete(plugin.name)
             this.config.requestRestart()
         } catch (err) {
+            console.error('Error installing plugin', plugin.name, err)
             this.erroredPlugin = plugin.name
             this.errorMessage = err
             this.busy.delete(plugin.name)
@@ -114,6 +115,7 @@ export class PluginsSettingsTabComponent {
             this.busy.delete(plugin.name)
             this.config.requestRestart()
         } catch (err) {
+            console.error('Error uninstalling plugin', plugin.name, err)
             this.erroredPlugin = plugin.name
             this.errorMessage = err
             this.busy.delete(plugin.name)

tabby-serial/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@types/node": "14.14.14",

tabby-settings/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@types/marked": "^5.0.1",

tabby-ssh/package.json

@@ -17,7 +17,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@types/node": "20.3.1",

tabby-ssh/src/components/sftpPanel.component.pug

@@ -17,6 +17,10 @@
 
     .breadcrumb-spacer.flex-grow-1.h-100((dblclick)='editPath()')
 
+    button.btn.btn-link.btn-sm.flex-shrink-0.d-flex(*ngIf='!showFilter', (click)='showFilter = true')
+        i.fas.fa-filter.me-1
+        div(translate) Filter
+
     button.btn.btn-link.btn-sm.flex-shrink-0.d-flex((click)='openCreateDirectoryModal()')
         i.fas.fa-plus.me-1
         div(translate) Create directory
@@ -31,6 +35,19 @@
 
     button.btn.btn-link.text-decoration-none((click)='close()') !{require('../../../tabby-core/src/icons/times.svg')}
 
+.filter-bar.px-3.py-2.border-bottom(*ngIf='showFilter')
+    .input-group
+        input.form-control(
+            type='text',
+            placeholder='Filter...',
+            autofocus,
+            [(ngModel)]='filterText',
+            (input)='onFilterChange()',
+            (keydown.escape)='clearFilter()'
+        )
+        button.btn.btn-secondary((click)='clearFilter()')
+            i.fas.fa-times
+
 .body(dropZone, (transfer)='uploadOneFolder($event)')
     a.alert.alert-info.d-flex.align-items-center(
         *ngIf='shouldShowCWDTip && !cwdDetectionAvailable',
@@ -47,13 +64,13 @@
         div(*ngIf='fileList === null', translate) Loading
         .list-group.list-group-light(*ngIf='fileList !== null')
             .list-group-item.list-group-item-action.d-flex.align-items-center(
-                *ngIf='path !== "/"',
+                *ngIf='path !== "/" && (!showFilter || filterText.trim() === "")',
                 (click)='goUp()'
             )
                 i.fas.fa-fw.fa-level-up-alt
                 div(translate) Go up
             .list-group-item.list-group-item-action.d-flex.align-items-center(
-                *ngFor='let item of fileList',
+                *ngFor='let item of filteredFileList',
                 (contextmenu)='showContextMenu(item, $event)',
                 (click)='open(item)'
             )
@@ -63,3 +80,6 @@
                 .size(*ngIf='!item.isDirectory') {{item.size|filesize}}
                 .date {{item.modified|tabbyDate}}
                 .mode {{getModeString(item)}}
+        .alert.alert-info.text-center.mt-3(*ngIf='fileList !== null && filteredFileList.length === 0 && showFilter && filterText.trim() !== ""')
+            i.fas.fa-search.me-2
+            span(translate) No files match the filter "{{filterText}}"

tabby-ssh/src/components/sftpPanel.component.scss

@@ -9,6 +9,10 @@
         flex: none;
     }
 
+    > .filter-bar {
+        flex: none;
+    }
+
     > .body {
         padding: 10px 20px;
         flex: 1 1 0;

tabby-ssh/src/components/sftpPanel.component.ts

@@ -1,7 +1,7 @@
 import * as C from 'constants'
 import { posix as path } from 'path'
 import { Component, Input, Output, EventEmitter, Inject, Optional } from '@angular/core'
-import { FileUpload, DirectoryUpload, MenuItemOptions, NotificationsService, PlatformService } from 'tabby-core'
+import { FileUpload, DirectoryUpload, DirectoryDownload, MenuItemOptions, NotificationsService, PlatformService } from 'tabby-core'
 import { SFTPSession, SFTPFile } from '../session/sftp'
 import { SSHSession } from '../session/ssh'
 import { SFTPContextMenuItemProvider } from '../api'
@@ -23,11 +23,14 @@ export class SFTPPanelComponent {
     @Output() closed = new EventEmitter<void>()
     sftp: SFTPSession
     fileList: SFTPFile[]|null = null
+    filteredFileList: SFTPFile[] = []
     @Input() path = '/'
     @Output() pathChange = new EventEmitter<string>()
     pathSegments: PathSegment[] = []
     @Input() cwdDetectionAvailable = false
     editingPath: string|null = null
+    showFilter = false
+    filterText = ''
 
     constructor (
         private ngbModal: NgbModal,
@@ -54,6 +57,8 @@ export class SFTPPanelComponent {
         this.path = newPath
         this.pathChange.next(this.path)
 
+        this.clearFilter()
+
         let p = newPath
         this.pathSegments = []
         while (p !== '/') {
@@ -65,6 +70,7 @@ export class SFTPPanelComponent {
         }
 
         this.fileList = null
+        this.filteredFileList = []
         try {
             this.fileList = await this.sftp.readdir(this.path)
         } catch (error) {
@@ -79,6 +85,8 @@ export class SFTPPanelComponent {
         this.fileList.sort((a, b) =>
             dirKey(b) - dirKey(a) ||
             a.name.localeCompare(b.name))
+
+        this.updateFilteredList()
     }
 
     getFileType (fileExtension: string): string {
@@ -220,6 +228,68 @@ export class SFTPPanelComponent {
         this.sftp.download(itemPath, transfer)
     }
 
+    async downloadFolder (folder: SFTPFile): Promise<void> {
+        try {
+            const transfer = await this.platform.startDownloadDirectory(folder.name, 0)
+            if (!transfer) {
+                return
+            }
+
+            // Start background size calculation and download simultaneously
+            const sizeCalculationPromise = this.calculateFolderSizeAndUpdate(folder, transfer)
+            const downloadPromise = this.downloadFolderRecursive(folder, transfer, '')
+
+            try {
+                await Promise.all([sizeCalculationPromise, downloadPromise])
+                transfer.setStatus('')
+                transfer.setCompleted(true)
+            } catch (error) {
+                transfer.cancel()
+                throw error
+            } finally {
+                transfer.close()
+            }
+        } catch (error) {
+            this.notifications.error(`Failed to download folder: ${error.message}`)
+            throw error
+        }
+    }
+
+    private async calculateFolderSizeAndUpdate (folder: SFTPFile, transfer: DirectoryDownload) {
+        let totalSize = 0
+        const items = await this.sftp.readdir(folder.fullPath)
+        for (const item of items) {
+            if (item.isDirectory) {
+                totalSize += await this.calculateFolderSizeAndUpdate(item, transfer)
+            } else {
+                totalSize += item.size
+            }
+            transfer.setTotalSize(totalSize)
+        }
+        return totalSize
+    }
+
+    private async downloadFolderRecursive (folder: SFTPFile, transfer: DirectoryDownload, relativePath: string): Promise<void> {
+        const items = await this.sftp.readdir(folder.fullPath)
+
+        for (const item of items) {
+            if (transfer.isCancelled()) {
+                throw new Error('Download cancelled')
+            }
+
+            const itemRelativePath = relativePath ? `${relativePath}/${item.name}` : item.name
+
+            transfer.setStatus(itemRelativePath)
+            if (item.isDirectory) {
+                await transfer.createDirectory(itemRelativePath)
+                await this.downloadFolderRecursive(item, transfer, itemRelativePath)
+            } else {
+                const fileDownload = await transfer.createFile(itemRelativePath, item.mode, item.size)
+                await this.sftp.download(item.fullPath, fileDownload)
+            }
+        }
+    }
+
     getModeString (item: SFTPFile): string {
         const s = 'SGdrwxrwxrwx'
         const e = '   ---------'
@@ -274,4 +344,29 @@ export class SFTPPanelComponent {
         this.closed.emit()
     }
 
+    clearFilter (): void {
+        this.showFilter = false
+        this.filterText = ''
+        this.updateFilteredList()
+    }
+
+    onFilterChange (): void {
+        this.updateFilteredList()
+    }
+
+    private updateFilteredList (): void {
+        if (!this.fileList) {
+            this.filteredFileList = []
+            return
+        }
+
+        if (!this.showFilter || this.filterText.trim() === '') {
+            this.filteredFileList = this.fileList
+            return
+        }
+
+        this.filteredFileList = this.fileList.filter(item =>
+            item.name.toLowerCase().includes(this.filterText.toLowerCase()),
+        )
+    }
 }

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

@@ -179,6 +179,7 @@ export class SSHTabComponent extends ConnectableTerminalTabComponent<SSHProfile>
             try {
                 await this.initializeSessionMaybeMultiplex(false)
             } catch (e) {
+                console.error('SSH session initialization failed', e)
                 this.write(colors.black.bgRed(' X ') + ' ' + colors.red(e.message) + '\r\n')
                 return
             }

tabby-ssh/src/index.ts

@@ -66,4 +66,5 @@ export default class SSHModule { }
 
 export * from './api'
 export { SFTPFile, SFTPSession } from './session/sftp'
-export { SFTPPanelComponent }
+export { SFTPPanelComponent, SSHTabComponent }
+export { PasswordStorageService } from './services/passwordStorage.service'

tabby-ssh/src/profiles.ts

@@ -20,7 +20,7 @@ export class SSHProfilesService extends QuickConnectProfileProvider<SSHProfile>
             auth: null,
             password: null,
             privateKeys: [],
-            keepaliveInterval: 5000,
+            keepaliveInterval: null,
             keepaliveCountMax: 10,
             readyTimeout: null,
             x11: false,

tabby-ssh/src/session/ssh.ts

@@ -317,7 +317,7 @@ export class SSHSession {
                     key: this.profile.options.algorithms?.[SSHAlgorithmType.HOSTKEY]?.filter(x => supportedAlgorithms[SSHAlgorithmType.HOSTKEY].includes(x)),
                     compression: this.profile.options.algorithms?.[SSHAlgorithmType.COMPRESSION]?.filter(x => supportedAlgorithms[SSHAlgorithmType.COMPRESSION].includes(x)),
                 },
-                keepaliveIntervalSeconds: Math.round((this.profile.options.keepaliveInterval ?? 15000) / 1000),
+                keepaliveIntervalSeconds: this.profile.options.keepaliveInterval ? Math.round(this.profile.options.keepaliveInterval / 1000) : undefined,
                 keepaliveCountMax: this.profile.options.keepaliveCountMax,
                 connectionTimeoutSeconds: this.profile.options.readyTimeout ? Math.round(this.profile.options.readyTimeout / 1000) : undefined,
             },

tabby-ssh/src/sftpContextMenu.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { MenuItemOptions, PlatformService, TranslateService } from 'tabby-core'
+import { MenuItemOptions, PlatformService, TranslateService, HostAppService, Platform } from 'tabby-core'
 import { SFTPSession, SFTPFile } from './session/sftp'
 import { SFTPContextMenuItemProvider } from './api'
 import { SFTPDeleteModalComponent } from './components/sftpDeleteModal.component'
@@ -16,37 +16,49 @@ export class CommonSFTPContextMenu extends SFTPContextMenuItemProvider {
         private platform: PlatformService,
         private ngbModal: NgbModal,
         private translate: TranslateService,
+        private hostApp: HostAppService,
     ) {
         super()
     }
 
     async getItems (item: SFTPFile, panel: SFTPPanelComponent): Promise<MenuItemOptions[]> {
-        return [
+        const items: MenuItemOptions[] = [
             {
                 click: async () => {
                     await panel.openCreateDirectoryModal()
                 },
                 label: this.translate.instant('Create directory'),
             },
-            {
-                click: async () => {
-                    if ((await this.platform.showMessageBox({
-                        type: 'warning',
-                        message: this.translate.instant('Delete {fullPath}?', item),
-                        defaultId: 0,
-                        cancelId: 1,
-                        buttons: [
-                            this.translate.instant('Delete'),
-                            this.translate.instant('Cancel'),
-                        ],
-                    })).response === 0) {
-                        await this.deleteItem(item, panel.sftp)
-                        panel.navigate(panel.path)
-                    }
-                },
-                label: this.translate.instant('Delete'),
-            },
         ]
+
+        // Add download folder option for directories (only in electron)
+        if (item.isDirectory && this.hostApp.platform !== Platform.Web) {
+            items.push({
+                click: () => panel.downloadFolder(item),
+                label: this.translate.instant('Download directory'),
+            })
+        }
+
+        items.push({
+            click: async () => {
+                if ((await this.platform.showMessageBox({
+                    type: 'warning',
+                    message: this.translate.instant('Delete {fullPath}?', item),
+                    defaultId: 0,
+                    cancelId: 1,
+                    buttons: [
+                        this.translate.instant('Delete'),
+                        this.translate.instant('Cancel'),
+                    ],
+                })).response === 0) {
+                    await this.deleteItem(item, panel.sftp)
+                    panel.navigate(panel.path)
+                }
+            },
+            label: this.translate.instant('Delete'),
+        })
+
+        return items
     }
 
     async deleteItem (item: SFTPFile, session: SFTPSession): Promise<void> {

tabby-telnet/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "ansi-colors": "^4.1.1",

tabby-terminal/package.json

@@ -16,7 +16,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@xterm/addon-canvas": "^0.6.0",

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

@@ -17,6 +17,8 @@ import { getTerminalBackgroundColor } from '../helpers'
 
 
 const INACTIVE_TAB_UNLOAD_DELAY = 1000 * 30
+const OSC_FOCUS_IN = Buffer.from('\x1b[I')
+const OSC_FOCUS_OUT = Buffer.from('\x1b[O')
 
 /**
  * A class to base your custom terminal tabs on
@@ -494,7 +496,7 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
             data = Buffer.from(data, 'utf-8')
         }
         this.session?.feedFromTerminal(data)
-        if (this.config.store.terminal.scrollOnInput) {
+        if (this.config.store.terminal.scrollOnInput && !data.equals(OSC_FOCUS_IN) && !data.equals(OSC_FOCUS_OUT)) {
             this.frontend?.scrollToBottom()
         }
     }
@@ -542,7 +544,7 @@ export class BaseTerminalTabComponent<P extends BaseTerminalProfile> extends Bas
         }
 
         if (!this.alternateScreenActive) {
-            if (data.includes('\r') && this.config.store.terminal.warnOnMultilinePaste) {
+            if ((data.includes('\r') || data.includes('\n')) && this.config.store.terminal.warnOnMultilinePaste) {
                 const buttons = [
                     this.translate.instant('Paste'),
                     this.translate.instant('Cancel'),

tabby-terminal/src/components/searchPanel.component.pug

@@ -16,14 +16,14 @@
 ng-container(*ngIf='state.resultCount > 0')
     button.btn.btn-link(
         (click)='findPrevious()',
-        ngbTooltip='Search up',
+        [ngbTooltip]='"Search up"|translate',
         placement='bottom',
         [fastHtmlBind]='icons.arrowUp'
     )
 
     button.btn.btn-link(
         (click)='findNext()',
-        ngbTooltip='Search down',
+        [ngbTooltip]='"Search down"|translate',
         placement='bottom',
         [fastHtmlBind]='icons.arrowDown'
     )
@@ -34,7 +34,7 @@ button.btn(
     (click)='options.caseSensitive = !options.caseSensitive; saveSearchOptions()',
     [class.btn-link]='!options.caseSensitive',
     [class.btn-info]='options.caseSensitive',
-    ngbTooltip='Case sensitivity',
+    [ngbTooltip]='"Case sensitivity"|translate',
     placement='bottom',
     [fastHtmlBind]='icons.case'
 )
@@ -43,7 +43,7 @@ button.btn(
     (click)='options.regex = !options.regex; saveSearchOptions()',
     [class.btn-link]='!options.regex',
     [class.btn-info]='options.regex',
-    ngbTooltip='Regular expression',
+    [ngbTooltip]='"Regular expression"|translate',
     placement='bottom',
     [fastHtmlBind]='icons.regexp'
 )
@@ -52,7 +52,7 @@ button.btn(
     (click)='options.wholeWord = !options.wholeWord; saveSearchOptions()',
     [class.btn-link]='!options.wholeWord',
     [class.btn-info]='options.wholeWord',
-    ngbTooltip='Whole word',
+    [ngbTooltip]='"Whole word"|translate',
     placement='bottom',
     [fastHtmlBind]='icons.wholeWord'
 )

tabby-terminal/src/features/zmodem.ts

@@ -27,7 +27,7 @@ class ZModemMiddleware extends SessionMiddleware {
         this.logger = log.create('zmodem')
         this.sentry = new ZModem.Sentry({
             to_terminal: data => {
-                if (this.isActive) {
+                if (this.isActive && this.activeSession) {
                     this.outputToTerminal.next(Buffer.from(data))
                 }
             },
@@ -42,25 +42,32 @@ class ZModemMiddleware extends SessionMiddleware {
             },
             on_retract: () => {
                 this.showMessage('transfer cancelled')
+                this.activeSession = null
+                this.isActive = false
             },
         })
     }
 
     feedFromSession (data: Buffer): void {
-        const chunkSize = 1024
-        for (let i = 0; i <= Math.floor(data.length / chunkSize); i++) {
+        if (this.isActive || this.activeSession) {
             try {
-                this.sentry.consume(Buffer.from(data.slice(i * chunkSize, (i + 1) * chunkSize)))
+                this.sentry.consume(data)
             } catch (e) {
                 this.showMessage(colors.bgRed.black(' Error ') + ' ' + e)
                 this.logger.error('protocol error', e)
-                this.activeSession.abort()
+                this.activeSession?.abort()
                 this.activeSession = null
                 this.isActive = false
+                // Don't forward the problematic data to terminal
                 return
             }
-        }
-        if (!this.isActive) {
+        } else {
+            try {
+                this.sentry.consume(data)
+            } catch (e) {
+                this.logger.error('zmodem detection error', e)
+            }
+
             this.outputToTerminal.next(data)
         }
     }
@@ -73,25 +80,35 @@ class ZModemMiddleware extends SessionMiddleware {
         this.activeSession = zsession
         this.logger.info('new session', zsession)
 
-        if (zsession.type === 'send') {
-            const transfers = await this.platform.startUpload({ multiple: true })
-            let filesRemaining = transfers.length
-            let sizeRemaining = transfers.reduce((a, b) => a + b.getSize(), 0)
-            for (const transfer of transfers) {
-                await this.sendFile(zsession, transfer, filesRemaining, sizeRemaining)
-                filesRemaining--
-                sizeRemaining -= transfer.getSize()
+        try {
+            if (zsession.type === 'send') {
+                const transfers = await this.platform.startUpload({ multiple: true })
+                let filesRemaining = transfers.length
+                let sizeRemaining = transfers.reduce((a, b) => a + b.getSize(), 0)
+                for (const transfer of transfers) {
+                    await this.sendFile(zsession, transfer, filesRemaining, sizeRemaining)
+                    filesRemaining--
+                    sizeRemaining -= transfer.getSize()
+                }
+                await zsession.close()
+            } else {
+                zsession.on('offer', xfer => {
+                    this.receiveFile(xfer, zsession)
+                })
+
+                zsession.start()
+
+                await new Promise(resolve => zsession.on('session_end', resolve))
             }
-            this.activeSession = null
-            await zsession.close()
-        } else {
-            zsession.on('offer', xfer => {
-                this.receiveFile(xfer, zsession)
-            })
 
-            zsession.start()
-
-            await new Promise(resolve => zsession.on('session_end', resolve))
+            this.showMessage(colors.bgBlue.black(' ZMODEM ') + ' Complete')
+        } catch (error) {
+            this.logger.error('ZMODEM session error', error)
+            this.showMessage(colors.bgRed.black(' ZMODEM ') + ` Session failed: ${error.message}`)
+            try {
+                zsession.abort()
+            } catch { }
+        } finally {
             this.activeSession = null
         }
     }

tabby-web-demo/package.json

@@ -11,7 +11,7 @@
     "data",
     "dist"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "devDependencies": {
     "@types/webpack-env": "^1.16.0"

tabby-web/package.json

@@ -15,7 +15,7 @@
     "dist",
     "typings"
   ],
-  "author": "Eugene Pankov",
+  "author": "Tabby Developers",
   "license": "MIT",
   "peerDependencies": {
     "@angular/core": "^15"

tabby-web/src/platform.ts

@@ -2,7 +2,7 @@ import '@vaadin/vaadin-context-menu'
 import copyToClipboard from 'copy-text-to-clipboard'
 import { Injectable, Inject } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { PlatformService, ClipboardContent, MenuItemOptions, MessageBoxOptions, MessageBoxResult, FileUpload, FileUploadOptions, FileDownload, HTMLFileUpload, DirectoryUpload } from 'tabby-core'
+import { PlatformService, ClipboardContent, MenuItemOptions, MessageBoxOptions, MessageBoxResult, FileUpload, FileUploadOptions, FileDownload, DirectoryDownload, HTMLFileUpload, DirectoryUpload } from 'tabby-core'
 
 // eslint-disable-next-line no-duplicate-imports
 import type { ContextMenuElement, ContextMenuItem } from '@vaadin/vaadin-context-menu'
@@ -114,6 +114,10 @@ export class WebPlatformService extends PlatformService {
         return transfer
     }
 
+    async startDownloadDirectory (_name: string, _estimatedSize?: number): Promise<DirectoryDownload|null> {
+        throw new Error('Unsupported')
+    }
+
     startUpload (options?: FileUploadOptions): Promise<FileUpload[]> {
         return new Promise(resolve => {
             this.fileSelector.onchange = () => {

yarn.lock

@@ -3179,10 +3179,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.286.tgz#0e039de59135f44ab9a8ec9025e53a9135eba11f"
   integrity sha512-Vp3CVhmYpgf4iXNKAucoQUDcCrBQX3XLBtwgFqP9BUXuucgvAV9zWp1kYU7LL9j4++s9O+12cb3wMtN4SJy6UQ==
 
-electron@^36.3:
-  version "36.3.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-36.3.1.tgz#12a8c1b1cd9163a4bd0cb60f89816243b26ab788"
-  integrity sha512-LeOZ+tVahmctHaAssLCGRRUa2SAO09GXua3pKdG+WzkbSDMh+3iOPONNVPTqGp8HlWnzGj4r6mhsIbM2RgH+eQ==
+electron@^36.4:
+  version "36.7.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-36.7.1.tgz#73bbb460c60f529e00b9d3eff78fd135c42172ea"
+  integrity sha512-vkih7vbmWT6O8+VWFt3a9FMLUZn0O4piR20nTX0IL/d9tz9RjpzoMvHqpI2CE1Rxew9bCzrg7FpgtcTdY6dlyw==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^22.7.7"