ssh: handle Unicode characters that are chopped up between chunks

Eugeny · Jan 4, 2023 · 2061236 · 2061236
1 parent e7cbb6a
commit 2061236
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/tabby-ssh/src/session/shell.ts b/tabby-ssh/src/session/shell.ts
@@ -6,13 +6,15 @@ import { LogService } from 'tabby-core'
 import { BaseSession } from 'tabby-terminal'
 import { SSHSession } from './ssh'
 import { SSHProfile } from '../api'
+import { UTF8Splitter } from '../../../app/lib/utfSplitter'
 
 
 export class SSHShellSession extends BaseSession {
     shell?: ClientChannel
     get serviceMessage$ (): Observable<string> { return this.serviceMessage }
     private serviceMessage = new Subject<string>()
     private ssh: SSHSession|null
+    private decoder = new UTF8Splitter()
 
     constructor (
         injector: Injector,
@@ -60,10 +62,14 @@ export class SSHShellSession extends BaseSession {
         })
 
         this.shell.on('data', data => {
-            this.emitOutput(data)
+            this.emitOutput(this.decoder.write(data))
         })
 
         this.shell.on('end', () => {
+            const remainder = this.decoder.flush()
+            if (remainder.length) {
+                this.emitOutput(remainder)
+            }
             this.logger.info('Shell session ended')
             if (this.open) {
                 this.destroy()