node-pty 1.2.0-beta.7 → 1.2.0-beta.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/binding.gyp +20 -18
- package/lib/unixTerminal.js +5 -2
- package/lib/windowsTerminal.js +1 -1
- package/package.json +6 -5
- package/prebuilds/darwin-arm64/pty.node +0 -0
- package/prebuilds/darwin-arm64/spawn-helper +0 -0
- package/prebuilds/darwin-x64/pty.node +0 -0
- package/prebuilds/darwin-x64/spawn-helper +0 -0
- package/prebuilds/linux-arm64/pty.node +0 -0
- package/prebuilds/linux-x64/pty.node +0 -0
- package/prebuilds/win32-arm64/conpty.node +0 -0
- package/prebuilds/win32-arm64/conpty.pdb +0 -0
- package/prebuilds/win32-arm64/conpty_console_list.node +0 -0
- package/prebuilds/win32-arm64/conpty_console_list.pdb +0 -0
- package/prebuilds/win32-x64/conpty.node +0 -0
- package/prebuilds/win32-x64/conpty.pdb +0 -0
- package/prebuilds/win32-x64/conpty_console_list.node +0 -0
- package/prebuilds/win32-x64/conpty_console_list.pdb +0 -0
- package/src/unix/pty.cc +7 -5
- package/typings/node-pty.d.ts +4 -1
- package/deps/.editorconfig +0 -2
- package/lib/conpty_console_list_agent.js.map +0 -1
- package/lib/eventEmitter2.js.map +0 -1
- package/lib/eventEmitter2.test.js +0 -30
- package/lib/eventEmitter2.test.js.map +0 -1
- package/lib/index.js.map +0 -1
- package/lib/interfaces.js.map +0 -1
- package/lib/shared/conout.js.map +0 -1
- package/lib/terminal.js.map +0 -1
- package/lib/terminal.test.js +0 -139
- package/lib/terminal.test.js.map +0 -1
- package/lib/testUtils.test.js +0 -28
- package/lib/testUtils.test.js.map +0 -1
- package/lib/types.js.map +0 -1
- package/lib/unixTerminal.js.map +0 -1
- package/lib/unixTerminal.test.js +0 -383
- package/lib/unixTerminal.test.js.map +0 -1
- package/lib/utils.js.map +0 -1
- package/lib/windowsConoutConnection.js.map +0 -1
- package/lib/windowsPtyAgent.js.map +0 -1
- package/lib/windowsPtyAgent.test.js +0 -90
- package/lib/windowsPtyAgent.test.js.map +0 -1
- package/lib/windowsTerminal.js.map +0 -1
- package/lib/windowsTerminal.test.js +0 -218
- package/lib/windowsTerminal.test.js.map +0 -1
- package/lib/worker/conoutSocketWorker.js.map +0 -1
- package/scripts/gen-compile-commands.js +0 -8
- package/scripts/increment-version.js +0 -54
- package/scripts/linux/checksums.txt +0 -2
- package/scripts/linux/install-sysroot.js +0 -158
- package/scripts/linux/verify-glibc-requirements.sh +0 -36
- package/src/conpty_console_list_agent.ts +0 -15
- package/src/eventEmitter2.test.ts +0 -30
- package/src/eventEmitter2.ts +0 -48
- package/src/index.ts +0 -52
- package/src/interfaces.ts +0 -138
- package/src/native.d.ts +0 -37
- package/src/shared/conout.ts +0 -15
- package/src/terminal.test.ts +0 -119
- package/src/terminal.ts +0 -211
- package/src/testUtils.test.ts +0 -23
- package/src/tsconfig.json +0 -22
- package/src/types.ts +0 -15
- package/src/unixTerminal.test.ts +0 -402
- package/src/unixTerminal.ts +0 -388
- package/src/utils.ts +0 -29
- package/src/windowsConoutConnection.ts +0 -82
- package/src/windowsPtyAgent.test.ts +0 -94
- package/src/windowsPtyAgent.ts +0 -261
- package/src/windowsTerminal.test.ts +0 -229
- package/src/windowsTerminal.ts +0 -203
- package/src/worker/conoutSocketWorker.ts +0 -22
package/src/unixTerminal.ts
DELETED
|
@@ -1,388 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Copyright (c) 2012-2015, Christopher Jeffrey (MIT License)
|
|
3
|
-
* Copyright (c) 2016, Daniel Imms (MIT License).
|
|
4
|
-
* Copyright (c) 2018, Microsoft Corporation (MIT License).
|
|
5
|
-
*/
|
|
6
|
-
import * as fs from 'fs';
|
|
7
|
-
import * as net from 'net';
|
|
8
|
-
import * as path from 'path';
|
|
9
|
-
import * as tty from 'tty';
|
|
10
|
-
import { Terminal, DEFAULT_COLS, DEFAULT_ROWS } from './terminal';
|
|
11
|
-
import { IProcessEnv, IPtyForkOptions, IPtyOpenOptions } from './interfaces';
|
|
12
|
-
import { ArgvOrCommandLine, IDisposable } from './types';
|
|
13
|
-
import { assign, loadNativeModule } from './utils';
|
|
14
|
-
|
|
15
|
-
const native = loadNativeModule('pty');
|
|
16
|
-
const pty: IUnixNative = native.module;
|
|
17
|
-
let helperPath = native.dir + '/spawn-helper';
|
|
18
|
-
helperPath = path.resolve(__dirname, helperPath);
|
|
19
|
-
helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');
|
|
20
|
-
helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');
|
|
21
|
-
|
|
22
|
-
const DEFAULT_FILE = 'sh';
|
|
23
|
-
const DEFAULT_NAME = 'xterm';
|
|
24
|
-
const DESTROY_SOCKET_TIMEOUT_MS = 200;
|
|
25
|
-
|
|
26
|
-
export class UnixTerminal extends Terminal {
|
|
27
|
-
protected _fd: number;
|
|
28
|
-
protected _pty: string;
|
|
29
|
-
|
|
30
|
-
protected _file: string;
|
|
31
|
-
protected _name: string;
|
|
32
|
-
|
|
33
|
-
protected _readable: boolean;
|
|
34
|
-
protected _writable: boolean;
|
|
35
|
-
|
|
36
|
-
private _boundClose: boolean = false;
|
|
37
|
-
private _emittedClose: boolean = false;
|
|
38
|
-
|
|
39
|
-
private _writeStream: CustomWriteStream;
|
|
40
|
-
|
|
41
|
-
private _master: net.Socket | undefined;
|
|
42
|
-
private _slave: net.Socket | undefined;
|
|
43
|
-
|
|
44
|
-
public get master(): net.Socket | undefined { return this._master; }
|
|
45
|
-
public get slave(): net.Socket | undefined { return this._slave; }
|
|
46
|
-
|
|
47
|
-
constructor(file?: string, args?: ArgvOrCommandLine, opt?: IPtyForkOptions) {
|
|
48
|
-
super(opt);
|
|
49
|
-
|
|
50
|
-
if (typeof args === 'string') {
|
|
51
|
-
throw new Error('args as a string is not supported on unix.');
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
// Initialize arguments
|
|
55
|
-
args = args || [];
|
|
56
|
-
file = file || DEFAULT_FILE;
|
|
57
|
-
opt = opt || {};
|
|
58
|
-
opt.env = opt.env || process.env;
|
|
59
|
-
|
|
60
|
-
this._cols = opt.cols || DEFAULT_COLS;
|
|
61
|
-
this._rows = opt.rows || DEFAULT_ROWS;
|
|
62
|
-
const uid = opt.uid ?? -1;
|
|
63
|
-
const gid = opt.gid ?? -1;
|
|
64
|
-
const env: IProcessEnv = assign({}, opt.env);
|
|
65
|
-
|
|
66
|
-
if (opt.env === process.env) {
|
|
67
|
-
this._sanitizeEnv(env);
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
const cwd = opt.cwd || process.cwd();
|
|
71
|
-
env.PWD = cwd;
|
|
72
|
-
const name = opt.name || env.TERM || DEFAULT_NAME;
|
|
73
|
-
env.TERM = name;
|
|
74
|
-
const parsedEnv = this._parseEnv(env);
|
|
75
|
-
|
|
76
|
-
const encoding = (opt.encoding === undefined ? 'utf8' : opt.encoding);
|
|
77
|
-
|
|
78
|
-
const onexit = (code: number, signal: number): void => {
|
|
79
|
-
// XXX Sometimes a data event is emitted after exit. Wait til socket is
|
|
80
|
-
// destroyed.
|
|
81
|
-
if (!this._emittedClose) {
|
|
82
|
-
if (this._boundClose) {
|
|
83
|
-
return;
|
|
84
|
-
}
|
|
85
|
-
this._boundClose = true;
|
|
86
|
-
// From macOS High Sierra 10.13.2 sometimes the socket never gets
|
|
87
|
-
// closed. A timeout is applied here to avoid the terminal never being
|
|
88
|
-
// destroyed when this occurs.
|
|
89
|
-
let timeout: NodeJS.Timeout | null = setTimeout(() => {
|
|
90
|
-
timeout = null;
|
|
91
|
-
// Destroying the socket now will cause the close event to fire
|
|
92
|
-
this._socket.destroy();
|
|
93
|
-
}, DESTROY_SOCKET_TIMEOUT_MS);
|
|
94
|
-
this.once('close', () => {
|
|
95
|
-
if (timeout !== null) {
|
|
96
|
-
clearTimeout(timeout);
|
|
97
|
-
}
|
|
98
|
-
this.emit('exit', code, signal);
|
|
99
|
-
});
|
|
100
|
-
return;
|
|
101
|
-
}
|
|
102
|
-
this.emit('exit', code, signal);
|
|
103
|
-
};
|
|
104
|
-
|
|
105
|
-
// fork
|
|
106
|
-
const term = pty.fork(file, args, parsedEnv, cwd, this._cols, this._rows, uid, gid, (encoding === 'utf8'), helperPath, onexit);
|
|
107
|
-
|
|
108
|
-
this._socket = new tty.ReadStream(term.fd);
|
|
109
|
-
if (encoding !== null) {
|
|
110
|
-
this._socket.setEncoding(encoding);
|
|
111
|
-
}
|
|
112
|
-
this._writeStream = new CustomWriteStream(term.fd, (encoding || undefined) as BufferEncoding);
|
|
113
|
-
|
|
114
|
-
// setup
|
|
115
|
-
this._socket.on('error', (err: any) => {
|
|
116
|
-
// NOTE: fs.ReadStream gets EAGAIN twice at first:
|
|
117
|
-
if (err.code) {
|
|
118
|
-
if (~err.code.indexOf('EAGAIN')) {
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
// close
|
|
124
|
-
this._close();
|
|
125
|
-
// EIO on exit from fs.ReadStream:
|
|
126
|
-
if (!this._emittedClose) {
|
|
127
|
-
this._emittedClose = true;
|
|
128
|
-
this.emit('close');
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
// EIO, happens when someone closes our child process: the only process in
|
|
132
|
-
// the terminal.
|
|
133
|
-
// node < 0.6.14: errno 5
|
|
134
|
-
// node >= 0.6.14: read EIO
|
|
135
|
-
if (err.code) {
|
|
136
|
-
if (~err.code.indexOf('errno 5') || ~err.code.indexOf('EIO')) {
|
|
137
|
-
return;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
// throw anything else
|
|
142
|
-
if (this.listeners('error').length < 2) {
|
|
143
|
-
throw err;
|
|
144
|
-
}
|
|
145
|
-
});
|
|
146
|
-
|
|
147
|
-
this._pid = term.pid;
|
|
148
|
-
this._fd = term.fd;
|
|
149
|
-
this._pty = term.pty;
|
|
150
|
-
|
|
151
|
-
this._file = file;
|
|
152
|
-
this._name = name;
|
|
153
|
-
|
|
154
|
-
this._readable = true;
|
|
155
|
-
this._writable = true;
|
|
156
|
-
|
|
157
|
-
this._socket.on('close', () => {
|
|
158
|
-
if (this._emittedClose) {
|
|
159
|
-
return;
|
|
160
|
-
}
|
|
161
|
-
this._emittedClose = true;
|
|
162
|
-
this._close();
|
|
163
|
-
this.emit('close');
|
|
164
|
-
});
|
|
165
|
-
|
|
166
|
-
this._forwardEvents();
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
protected _write(data: string | Buffer): void {
|
|
170
|
-
this._writeStream.write(data);
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
/* Accessors */
|
|
174
|
-
get fd(): number { return this._fd; }
|
|
175
|
-
get ptsName(): string { return this._pty; }
|
|
176
|
-
|
|
177
|
-
/**
|
|
178
|
-
* openpty
|
|
179
|
-
*/
|
|
180
|
-
|
|
181
|
-
public static open(opt: IPtyOpenOptions): UnixTerminal {
|
|
182
|
-
const self: UnixTerminal = Object.create(UnixTerminal.prototype);
|
|
183
|
-
opt = opt || {};
|
|
184
|
-
|
|
185
|
-
if (arguments.length > 1) {
|
|
186
|
-
opt = {
|
|
187
|
-
cols: arguments[1],
|
|
188
|
-
rows: arguments[2]
|
|
189
|
-
};
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
const cols = opt.cols || DEFAULT_COLS;
|
|
193
|
-
const rows = opt.rows || DEFAULT_ROWS;
|
|
194
|
-
const encoding = (opt.encoding === undefined ? 'utf8' : opt.encoding);
|
|
195
|
-
|
|
196
|
-
// open
|
|
197
|
-
const term: IUnixOpenProcess = pty.open(cols, rows);
|
|
198
|
-
|
|
199
|
-
self._master = new tty.ReadStream(term.master);
|
|
200
|
-
if (encoding !== null) {
|
|
201
|
-
self._master.setEncoding(encoding);
|
|
202
|
-
}
|
|
203
|
-
self._master.resume();
|
|
204
|
-
|
|
205
|
-
self._slave = new tty.ReadStream(term.slave);
|
|
206
|
-
if (encoding !== null) {
|
|
207
|
-
self._slave.setEncoding(encoding);
|
|
208
|
-
}
|
|
209
|
-
self._slave.resume();
|
|
210
|
-
|
|
211
|
-
self._socket = self._master;
|
|
212
|
-
self._pid = -1;
|
|
213
|
-
self._fd = term.master;
|
|
214
|
-
self._pty = term.pty;
|
|
215
|
-
|
|
216
|
-
self._file = process.argv[0] || 'node';
|
|
217
|
-
self._name = process.env.TERM || '';
|
|
218
|
-
|
|
219
|
-
self._readable = true;
|
|
220
|
-
self._writable = true;
|
|
221
|
-
|
|
222
|
-
self._socket.on('error', err => {
|
|
223
|
-
self._close();
|
|
224
|
-
if (self.listeners('error').length < 2) {
|
|
225
|
-
throw err;
|
|
226
|
-
}
|
|
227
|
-
});
|
|
228
|
-
|
|
229
|
-
self._socket.on('close', () => {
|
|
230
|
-
self._close();
|
|
231
|
-
});
|
|
232
|
-
|
|
233
|
-
return self;
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
public destroy(): void {
|
|
237
|
-
this._close();
|
|
238
|
-
|
|
239
|
-
// Need to close the read stream so node stops reading a dead file
|
|
240
|
-
// descriptor. Then we can safely SIGHUP the shell.
|
|
241
|
-
this._socket.once('close', () => {
|
|
242
|
-
this.kill('SIGHUP');
|
|
243
|
-
});
|
|
244
|
-
|
|
245
|
-
this._socket.destroy();
|
|
246
|
-
this._writeStream.dispose();
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
public kill(signal?: string): void {
|
|
250
|
-
try {
|
|
251
|
-
process.kill(this.pid, signal || 'SIGHUP');
|
|
252
|
-
} catch (e) { /* swallow */ }
|
|
253
|
-
}
|
|
254
|
-
|
|
255
|
-
/**
|
|
256
|
-
* Gets the name of the process.
|
|
257
|
-
*/
|
|
258
|
-
public get process(): string {
|
|
259
|
-
if (process.platform === 'darwin') {
|
|
260
|
-
const title = pty.process(this._fd);
|
|
261
|
-
return (title !== 'kernel_task') ? title : this._file;
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
return pty.process(this._fd, this._pty) || this._file;
|
|
265
|
-
}
|
|
266
|
-
|
|
267
|
-
/**
|
|
268
|
-
* TTY
|
|
269
|
-
*/
|
|
270
|
-
|
|
271
|
-
public resize(cols: number, rows: number): void {
|
|
272
|
-
if (cols <= 0 || rows <= 0 || isNaN(cols) || isNaN(rows) || cols === Infinity || rows === Infinity) {
|
|
273
|
-
throw new Error('resizing must be done using positive cols and rows');
|
|
274
|
-
}
|
|
275
|
-
pty.resize(this._fd, cols, rows);
|
|
276
|
-
this._cols = cols;
|
|
277
|
-
this._rows = rows;
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
public clear(): void {
|
|
281
|
-
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
private _sanitizeEnv(env: IProcessEnv): void {
|
|
285
|
-
// Make sure we didn't start our server from inside tmux.
|
|
286
|
-
delete env['TMUX'];
|
|
287
|
-
delete env['TMUX_PANE'];
|
|
288
|
-
|
|
289
|
-
// Make sure we didn't start our server from inside screen.
|
|
290
|
-
// http://web.mit.edu/gnu/doc/html/screen_20.html
|
|
291
|
-
delete env['STY'];
|
|
292
|
-
delete env['WINDOW'];
|
|
293
|
-
|
|
294
|
-
// Delete some variables that might confuse our terminal.
|
|
295
|
-
delete env['WINDOWID'];
|
|
296
|
-
delete env['TERMCAP'];
|
|
297
|
-
delete env['COLUMNS'];
|
|
298
|
-
delete env['LINES'];
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
interface IWriteTask {
|
|
303
|
-
/** The buffer being written. */
|
|
304
|
-
buffer: Buffer;
|
|
305
|
-
/** The current offset of not yet written data. */
|
|
306
|
-
offset: number;
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
/**
|
|
310
|
-
* A custom write stream that writes directly to a file descriptor with proper
|
|
311
|
-
* handling of backpressure and errors. This avoids some event loop exhaustion
|
|
312
|
-
* issues that can occur when using the standard APIs in Node.
|
|
313
|
-
*/
|
|
314
|
-
class CustomWriteStream implements IDisposable {
|
|
315
|
-
|
|
316
|
-
private readonly _writeQueue: IWriteTask[] = [];
|
|
317
|
-
private _writeImmediate: NodeJS.Immediate | undefined;
|
|
318
|
-
|
|
319
|
-
constructor(
|
|
320
|
-
private readonly _fd: number,
|
|
321
|
-
private readonly _encoding: BufferEncoding
|
|
322
|
-
) {
|
|
323
|
-
}
|
|
324
|
-
|
|
325
|
-
dispose(): void {
|
|
326
|
-
clearImmediate(this._writeImmediate);
|
|
327
|
-
this._writeImmediate = undefined;
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
write(data: string | Buffer): void {
|
|
331
|
-
// Writes are put in a queue and processed asynchronously in order to handle
|
|
332
|
-
// backpressure from the kernel buffer.
|
|
333
|
-
const buffer = typeof data === 'string'
|
|
334
|
-
? Buffer.from(data, this._encoding)
|
|
335
|
-
: Buffer.from(data);
|
|
336
|
-
|
|
337
|
-
if (buffer.byteLength !== 0) {
|
|
338
|
-
this._writeQueue.push({ buffer, offset: 0 });
|
|
339
|
-
if (this._writeQueue.length === 1) {
|
|
340
|
-
this._processWriteQueue();
|
|
341
|
-
}
|
|
342
|
-
}
|
|
343
|
-
}
|
|
344
|
-
|
|
345
|
-
private _processWriteQueue(): void {
|
|
346
|
-
this._writeImmediate = undefined;
|
|
347
|
-
|
|
348
|
-
if (this._writeQueue.length === 0) {
|
|
349
|
-
return;
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
const task = this._writeQueue[0];
|
|
353
|
-
|
|
354
|
-
// Write to the underlying file descriptor and handle it directly, rather
|
|
355
|
-
// than using the `net.Socket`/`tty.WriteStream` wrappers which swallow and
|
|
356
|
-
// mask errors like EAGAIN and can cause the thread to block indefinitely.
|
|
357
|
-
fs.write(this._fd, task.buffer, task.offset, (err, written) => {
|
|
358
|
-
if (err) {
|
|
359
|
-
if ('code' in err && err.code === 'EAGAIN') {
|
|
360
|
-
// `setImmediate` is used to yield to the event loop and re-attempt
|
|
361
|
-
// the write later.
|
|
362
|
-
this._writeImmediate = setImmediate(() => this._processWriteQueue());
|
|
363
|
-
} else {
|
|
364
|
-
// Stop processing immediately on unexpected error and log
|
|
365
|
-
this._writeQueue.length = 0;
|
|
366
|
-
console.error('Unhandled pty write error', err);
|
|
367
|
-
}
|
|
368
|
-
return;
|
|
369
|
-
}
|
|
370
|
-
|
|
371
|
-
task.offset += written;
|
|
372
|
-
if (task.offset >= task.buffer.byteLength) {
|
|
373
|
-
this._writeQueue.shift();
|
|
374
|
-
}
|
|
375
|
-
|
|
376
|
-
// Since there is more room in the kernel buffer, we can continue to write
|
|
377
|
-
// until we hit EAGAIN or exhaust the queue.
|
|
378
|
-
//
|
|
379
|
-
// Note that old versions of bash, like v3.2 which ships in macOS, appears
|
|
380
|
-
// to have a bug in its readline implementation that causes data
|
|
381
|
-
// corruption when writes to the pty happens too quickly. Instead of
|
|
382
|
-
// trying to workaround that we just accept it so that large pastes are as
|
|
383
|
-
// fast as possible.
|
|
384
|
-
// Context: https://github.com/microsoft/node-pty/issues/833
|
|
385
|
-
this._processWriteQueue();
|
|
386
|
-
});
|
|
387
|
-
}
|
|
388
|
-
}
|
package/src/utils.ts
DELETED
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Copyright (c) 2017, Daniel Imms (MIT License).
|
|
3
|
-
* Copyright (c) 2018, Microsoft Corporation (MIT License).
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
|
-
export function assign(target: any, ...sources: any[]): any {
|
|
7
|
-
sources.forEach(source => Object.keys(source).forEach(key => target[key] = source[key]));
|
|
8
|
-
return target;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
export function loadNativeModule(name: string): {dir: string, module: any} {
|
|
13
|
-
// Check build, debug, and then prebuilds.
|
|
14
|
-
const dirs = ['build/Release', 'build/Debug', `prebuilds/${process.platform}-${process.arch}`];
|
|
15
|
-
// Check relative to the parent dir for unbundled and then the current dir for bundled
|
|
16
|
-
const relative = ['..', '.'];
|
|
17
|
-
let lastError: unknown;
|
|
18
|
-
for (const d of dirs) {
|
|
19
|
-
for (const r of relative) {
|
|
20
|
-
const dir = `${r}/${d}`;
|
|
21
|
-
try {
|
|
22
|
-
return { dir, module: require(`${dir}/${name}.node`) };
|
|
23
|
-
} catch (e) {
|
|
24
|
-
lastError = e;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
throw new Error(`Failed to load native module: ${name}.node, checked: ${dirs.join(', ')}: ${lastError}`);
|
|
29
|
-
}
|
|
@@ -1,82 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Copyright (c) 2020, Microsoft Corporation (MIT License).
|
|
3
|
-
*/
|
|
4
|
-
|
|
5
|
-
import { Worker } from 'worker_threads';
|
|
6
|
-
import { Socket } from 'net';
|
|
7
|
-
import { IDisposable } from './types';
|
|
8
|
-
import { IWorkerData, ConoutWorkerMessage, getWorkerPipeName } from './shared/conout';
|
|
9
|
-
import { join } from 'path';
|
|
10
|
-
import { IEvent, EventEmitter2 } from './eventEmitter2';
|
|
11
|
-
|
|
12
|
-
/**
|
|
13
|
-
* The amount of time to wait for additional data after the conpty shell process has exited before
|
|
14
|
-
* shutting down the worker and sockets. The timer will be reset if a new data event comes in after
|
|
15
|
-
* the timer has started.
|
|
16
|
-
*/
|
|
17
|
-
const FLUSH_DATA_INTERVAL = 1000;
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* Connects to and manages the lifecycle of the conout socket. This socket must be drained on
|
|
21
|
-
* another thread in order to avoid deadlocks where Conpty waits for the out socket to drain
|
|
22
|
-
* when `ClosePseudoConsole` is called. This happens when data is being written to the terminal when
|
|
23
|
-
* the pty is closed.
|
|
24
|
-
*
|
|
25
|
-
* See also:
|
|
26
|
-
* - https://github.com/microsoft/node-pty/issues/375
|
|
27
|
-
* - https://github.com/microsoft/vscode/issues/76548
|
|
28
|
-
* - https://github.com/microsoft/terminal/issues/1810
|
|
29
|
-
* - https://docs.microsoft.com/en-us/windows/console/closepseudoconsole
|
|
30
|
-
*/
|
|
31
|
-
export class ConoutConnection implements IDisposable {
|
|
32
|
-
private _worker: Worker;
|
|
33
|
-
private _drainTimeout: NodeJS.Timeout | undefined;
|
|
34
|
-
private _isDisposed: boolean = false;
|
|
35
|
-
|
|
36
|
-
private _onReady = new EventEmitter2<void>();
|
|
37
|
-
public get onReady(): IEvent<void> { return this._onReady.event; }
|
|
38
|
-
|
|
39
|
-
constructor(
|
|
40
|
-
private _conoutPipeName: string,
|
|
41
|
-
private _useConptyDll: boolean
|
|
42
|
-
) {
|
|
43
|
-
const workerData: IWorkerData = {
|
|
44
|
-
conoutPipeName: _conoutPipeName
|
|
45
|
-
};
|
|
46
|
-
const scriptPath = __dirname.replace('node_modules.asar', 'node_modules.asar.unpacked');
|
|
47
|
-
this._worker = new Worker(join(scriptPath, 'worker/conoutSocketWorker.js'), { workerData });
|
|
48
|
-
this._worker.on('message', (message: ConoutWorkerMessage) => {
|
|
49
|
-
switch (message) {
|
|
50
|
-
case ConoutWorkerMessage.READY:
|
|
51
|
-
this._onReady.fire();
|
|
52
|
-
return;
|
|
53
|
-
default:
|
|
54
|
-
console.warn('Unexpected ConoutWorkerMessage', message);
|
|
55
|
-
}
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
dispose(): void {
|
|
60
|
-
if (!this._useConptyDll && this._isDisposed) {
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
this._isDisposed = true;
|
|
64
|
-
// Drain all data from the socket before closing
|
|
65
|
-
this._drainDataAndClose();
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
connectSocket(socket: Socket): void {
|
|
69
|
-
socket.connect(getWorkerPipeName(this._conoutPipeName));
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
private _drainDataAndClose(): void {
|
|
73
|
-
if (this._drainTimeout) {
|
|
74
|
-
clearTimeout(this._drainTimeout);
|
|
75
|
-
}
|
|
76
|
-
this._drainTimeout = setTimeout(() => this._destroySocket(), FLUSH_DATA_INTERVAL);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
private async _destroySocket(): Promise<void> {
|
|
80
|
-
await this._worker.terminate();
|
|
81
|
-
}
|
|
82
|
-
}
|
|
@@ -1,94 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Copyright (c) 2017, Daniel Imms (MIT License).
|
|
3
|
-
* Copyright (c) 2018, Microsoft Corporation (MIT License).
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
|
-
import * as assert from 'assert';
|
|
7
|
-
import { argsToCommandLine } from './windowsPtyAgent';
|
|
8
|
-
|
|
9
|
-
function check(file: string, args: string | string[], expected: string): void {
|
|
10
|
-
assert.equal(argsToCommandLine(file, args), expected);
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
if (process.platform === 'win32') {
|
|
14
|
-
describe('argsToCommandLine', () => {
|
|
15
|
-
describe('Plain strings', () => {
|
|
16
|
-
it('doesn\'t quote plain string', () => {
|
|
17
|
-
check('asdf', [], 'asdf');
|
|
18
|
-
});
|
|
19
|
-
it('doesn\'t escape backslashes', () => {
|
|
20
|
-
check('\\asdf\\qwer\\', [], '\\asdf\\qwer\\');
|
|
21
|
-
});
|
|
22
|
-
it('doesn\'t escape multiple backslashes', () => {
|
|
23
|
-
check('asdf\\\\qwer', [], 'asdf\\\\qwer');
|
|
24
|
-
});
|
|
25
|
-
it('adds backslashes before quotes', () => {
|
|
26
|
-
check('"asdf"qwer"', [], '\\"asdf\\"qwer\\"');
|
|
27
|
-
});
|
|
28
|
-
it('escapes backslashes before quotes', () => {
|
|
29
|
-
check('asdf\\"qwer', [], 'asdf\\\\\\"qwer');
|
|
30
|
-
});
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
describe('Quoted strings', () => {
|
|
34
|
-
it('quotes string with spaces', () => {
|
|
35
|
-
check('asdf qwer', [], '"asdf qwer"');
|
|
36
|
-
});
|
|
37
|
-
it('quotes empty string', () => {
|
|
38
|
-
check('', [], '""');
|
|
39
|
-
});
|
|
40
|
-
it('quotes string with tabs', () => {
|
|
41
|
-
check('asdf\tqwer', [], '"asdf\tqwer"');
|
|
42
|
-
});
|
|
43
|
-
it('escapes only the last backslash', () => {
|
|
44
|
-
check('\\asdf \\qwer\\', [], '"\\asdf \\qwer\\\\"');
|
|
45
|
-
});
|
|
46
|
-
it('doesn\'t escape multiple backslashes', () => {
|
|
47
|
-
check('asdf \\\\qwer', [], '"asdf \\\\qwer"');
|
|
48
|
-
});
|
|
49
|
-
it('escapes backslashes before quotes', () => {
|
|
50
|
-
check('asdf \\"qwer', [], '"asdf \\\\\\"qwer"');
|
|
51
|
-
});
|
|
52
|
-
it('escapes multiple backslashes at the end', () => {
|
|
53
|
-
check('asdf qwer\\\\', [], '"asdf qwer\\\\\\\\"');
|
|
54
|
-
});
|
|
55
|
-
});
|
|
56
|
-
|
|
57
|
-
describe('Multiple arguments', () => {
|
|
58
|
-
it('joins arguments with spaces', () => {
|
|
59
|
-
check('asdf', ['qwer zxcv', '', '"'], 'asdf "qwer zxcv" "" \\"');
|
|
60
|
-
});
|
|
61
|
-
it('array argument all in quotes', () => {
|
|
62
|
-
check('asdf', ['"surounded by quotes"'], 'asdf \\"surounded by quotes\\"');
|
|
63
|
-
});
|
|
64
|
-
it('array argument quotes in the middle', () => {
|
|
65
|
-
check('asdf', ['quotes "in the" middle'], 'asdf "quotes \\"in the\\" middle"');
|
|
66
|
-
});
|
|
67
|
-
it('array argument quotes near start', () => {
|
|
68
|
-
check('asdf', ['"quotes" near start'], 'asdf "\\"quotes\\" near start"');
|
|
69
|
-
});
|
|
70
|
-
it('array argument quotes near end', () => {
|
|
71
|
-
check('asdf', ['quotes "near end"'], 'asdf "quotes \\"near end\\""');
|
|
72
|
-
});
|
|
73
|
-
});
|
|
74
|
-
|
|
75
|
-
describe('Args as CommandLine', () => {
|
|
76
|
-
it('should handle empty string', () => {
|
|
77
|
-
check('file', '', 'file');
|
|
78
|
-
});
|
|
79
|
-
it('should not change args', () => {
|
|
80
|
-
check('file', 'foo bar baz', 'file foo bar baz');
|
|
81
|
-
check('file', 'foo \\ba"r \baz', 'file foo \\ba"r \baz');
|
|
82
|
-
});
|
|
83
|
-
});
|
|
84
|
-
|
|
85
|
-
describe('Real-world cases', () => {
|
|
86
|
-
it('quotes within quotes', () => {
|
|
87
|
-
check('cmd.exe', ['/c', 'powershell -noexit -command \'Set-location \"C:\\user\"\''], 'cmd.exe /c "powershell -noexit -command \'Set-location \\\"C:\\user\\"\'"');
|
|
88
|
-
});
|
|
89
|
-
it('space within quotes', () => {
|
|
90
|
-
check('cmd.exe', ['/k', '"C:\\Users\\alros\\Desktop\\test script.bat"'], 'cmd.exe /k \\"C:\\Users\\alros\\Desktop\\test script.bat\\"');
|
|
91
|
-
});
|
|
92
|
-
});
|
|
93
|
-
});
|
|
94
|
-
}
|