fixed zmodem errors - fixes #6677, fixes #5845, fixes #5243, fixes #5132

, fixes #5021, fixes #7511, fixes #7053, fixes #6917, fixes #6639, fixes #6259, fixes #6182, fixes #6122, fixes #5845, fixes #5737, fixes #5701, fixes #5609, fixes #5311, fixes #5243, fixes #5231, fixes #5132
Eugeny · Nov 20, 2022 · 9c89bab · 9c89bab
1 parent 0f0f61f
commit 9c89bab
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 185 deletions.
diff --git a/app/lib/pty.ts b/app/lib/pty.ts
@@ -4,7 +4,6 @@ import { ipcMain } from 'electron'
 import { Application } from './app'
 import { UTF8Splitter } from './utfSplitter'
 import { Subject, debounceTime } from 'rxjs'
-import { StringDecoder } from './stringDecoder'
 
 class PTYDataQueue {
     private buffers: Buffer[] = []
@@ -91,7 +90,6 @@ class PTYDataQueue {
 export class PTY {
     private pty: nodePTY.IPty
     private outputQueue: PTYDataQueue
-    private decoder = new StringDecoder()
     exited = false
 
     constructor (private id: string, private app: Application, ...args: any[]) {
@@ -101,7 +99,7 @@ export class PTY {
         }
 
         this.outputQueue = new PTYDataQueue(this.pty, data => {
-            setImmediate(() => this.emit('data', this.decoder.write(data)))
+            setImmediate(() => this.emit('data', data))
         })
 
         this.pty.onData(data => this.outputQueue.push(Buffer.from(data)))

diff --git a/app/lib/stringDecoder.ts b/app/lib/stringDecoder.ts
diff --git a/tabby-terminal/src/api/baseTerminalTab.component.ts b/tabby-terminal/src/api/baseTerminalTab.component.ts
@@ -123,6 +123,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
 
     protected logger: Logger
     protected output = new Subject<string>()
+    protected binaryOutput = new Subject<Buffer>()
     protected sessionChanged = new Subject<BaseSession|null>()
     private bellPlayer: HTMLAudioElement
     private termContainerSubscriptions = new SubscriptionContainer()
@@ -153,6 +154,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
     }
 
     get output$ (): Observable<string> { return this.output }
+    get binaryOutput$ (): Observable<Buffer> { return this.binaryOutput }
 
     get resize$ (): Observable<ResizeEvent> {
         if (!this.frontend) {
@@ -369,7 +371,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
         this.configure()
 
         setTimeout(() => {
-            this.output.subscribe(() => {
+            this.binaryOutput$.subscribe(() => {
                 this.displayActivity()
             })
         }, 1000)
@@ -564,6 +566,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
             }
         })
         this.output.complete()
+        this.binaryOutput.complete()
         this.frontendReady.complete()
 
         super.destroy()
@@ -741,6 +744,12 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
             }
         })
 
+        this.attachSessionHandler(this.session.binaryOutput$, data => {
+            if (this.enablePassthrough) {
+                this.binaryOutput.next(data)
+            }
+        })
+
         if (destroyOnSessionClose) {
             this.attachSessionHandler(this.session.closed$, () => {
                 this.destroy()

diff --git a/tabby-terminal/src/api/middleware.ts b/tabby-terminal/src/api/middleware.ts
@@ -22,7 +22,7 @@ export class SessionMiddleware {
     }
 }
 
-export class SesssionMiddlewareStack extends SessionMiddleware {
+export class SessionMiddlewareStack extends SessionMiddleware {
     private stack: SessionMiddleware[] = []
     private subs = new SubscriptionContainer()