GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-09-10 18:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssh: handle Unicode characters that are chopped up between chunks

Browse Source
This commit is contained in:
Eugene Pankov
2023-01-04 14:09:19 +01:00
parent e7cbb6a165
commit 206123615e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tabby-ssh/src/session/shell.ts
View File

@@ -6,6 +6,7 @@ import { LogService } from 'tabby-core'
import { BaseSession } from 'tabby-terminal' import { BaseSession } from 'tabby-terminal'
import { SSHSession } from './ssh' import { SSHSession } from './ssh'
import { SSHProfile } from '../api' import { SSHProfile } from '../api'
import { UTF8Splitter } from '../../../app/lib/utfSplitter'
export class SSHShellSession extends BaseSession { export class SSHShellSession extends BaseSession {
@@ -13,6 +14,7 @@ export class SSHShellSession extends BaseSession {
get serviceMessage$ (): Observable<string> { return this.serviceMessage } get serviceMessage$ (): Observable<string> { return this.serviceMessage }
private serviceMessage = new Subject<string>() private serviceMessage = new Subject<string>()
private ssh: SSHSession|null private ssh: SSHSession|null
private decoder = new UTF8Splitter()
constructor ( constructor (
injector: Injector, injector: Injector,
@@ -60,10 +62,14 @@ export class SSHShellSession extends BaseSession {
}) })
this.shell.on('data', data => { this.shell.on('data', data => {
this.emitOutput(data) this.emitOutput(this.decoder.write(data))
}) })
this.shell.on('end', () => { this.shell.on('end', () => {
const remainder = this.decoder.flush()
if (remainder.length) {
this.emitOutput(remainder)
}
this.logger.info('Shell session ended') this.logger.info('Shell session ended')
if (this.open) { if (this.open) {
this.destroy() this.destroy()