Skip to content
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

Jump to bottom

Workaround socket not being closed properly on High Sierra #164

Merged
merged 4 commits into from
Dec 9, 2017
Merged

Workaround socket not being closed properly on High Sierra #164

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa41f5c
Initial fix for high sierra term kill issue
Tyriar Dec 8, 2017
fd9bd33
Twweak timeout fix
Tyriar Dec 8, 2017
0a6d921
Clean up
Tyriar Dec 8, 2017
423cad1
Lower timeout to 200ms
Tyriar Dec 8, 2017
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
20 changes: 18 additions & 2 deletions src/unixTerminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const pty = require(path.join('..', 'build', 'Release', 'pty.node'));

const DEFAULT_FILE = 'sh';
const DEFAULT_NAME = 'xterm';
const DESTROY_SOCKET_TIMEOUT_MS = 200;

export class UnixTerminal extends Terminal {
protected _fd: number;
Expand Down Expand Up @@ -74,9 +75,24 @@ export class UnixTerminal extends Terminal {
// XXX Sometimes a data event is emitted after exit. Wait til socket is
// destroyed.
if (!this._emittedClose) {
if (this._boundClose) return;
if (this._boundClose) {
return;
}
this._boundClose = true;
this.once('close', () => this.emit('exit', code, signal));
// From macOS High Sierra 10.13.2 sometimes the socket never gets
// closed. A timeout is applied here to avoid the terminal never being
// destroyed when this occurs.
let timeout = setTimeout(() => {
timeout = null;
// Destroying the socket now will cause the close event to fire
this._socket.destroy();
}, DESTROY_SOCKET_TIMEOUT_MS);
this.once('close', () => {
if (timeout !== null) {
clearTimeout(timeout);
}
this.emit('exit', code, signal);
});
return;
}
this.emit('exit', code, signal);
Expand Down