Skip to content

Fix double input in terminal by disposing previous onData listeners #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shreehari-lyzr wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −5
Open

Fix double input in terminal by disposing previous onData listeners #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class ContainerManager {
private audit: AuditLog | null = null;
private policy: PolicyEngine | null = null;
private activeProcessCount = 0;
private onDataDisposable: { dispose(): void } | null = null;
private outputLineBuf = '';
private outputFlushTimer: ReturnType<typeof setTimeout> | null = null;
private gitService: GitService | null = null;
Expand Down Expand Up @@ -369,7 +370,8 @@ export class ContainerManager {

// Wire keystrokes directly to gitclaw stdin (no jsh in between)
this.shellWriter = this.shellProcess.input.getWriter();
terminal.onData((data) => {
this.onDataDisposable?.dispose();
this.onDataDisposable = terminal.onData((data) => {
this.shellWriter?.write(data);
this.audit?.logStdin(data);
});
Expand Down Expand Up @@ -418,7 +420,8 @@ export class ContainerManager {
);

this.shellWriter = this.shellProcess.input.getWriter();
terminal.onData((data) => {
this.onDataDisposable?.dispose();
this.onDataDisposable = terminal.onData((data) => {
this.shellWriter?.write(data);
this.audit?.logStdin(data);
});
Expand Down Expand Up @@ -593,7 +596,8 @@ export class ContainerManager {
);

this.shellWriter = this.shellProcess.input.getWriter();
terminal.onData((data) => {
this.onDataDisposable?.dispose();
this.onDataDisposable = terminal.onData((data) => {
this.shellWriter?.write(data);
this.audit?.logStdin(data);
});
Expand Down
4 changes: 2 additions & 2 deletions src/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export class TerminalManager {
}

/** Register a handler for user keystrokes (sent to shell stdin). */
onData(handler: (data: string) => void): void {
this.xterm.onData(handler);
onData(handler: (data: string) => void): { dispose(): void } {
return this.xterm.onData(handler);
}

/** Current terminal dimensions for pty resize. */
Expand Down