@theia/process 1.77.0-next.1 → 1.77.0-next.108
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/lib/common/process-common-module.js +4 -6
- package/lib/common/process-common-module.js.map +1 -1
- package/lib/common/process-manager-types.js +2 -5
- package/lib/common/process-manager-types.js.map +1 -1
- package/lib/common/shell-command-builder.d.ts +1 -1
- package/lib/common/shell-command-builder.d.ts.map +1 -1
- package/lib/common/shell-command-builder.js +19 -22
- package/lib/common/shell-command-builder.js.map +1 -1
- package/lib/common/shell-command-builder.slow-spec.d.ts +1 -1
- package/lib/common/shell-command-builder.slow-spec.d.ts.map +1 -1
- package/lib/common/shell-command-builder.slow-spec.js +9 -11
- package/lib/common/shell-command-builder.slow-spec.js.map +1 -1
- package/lib/common/shell-quoting.js +1 -9
- package/lib/common/shell-quoting.js.map +1 -1
- package/lib/node/dev-null-stream.d.ts +1 -1
- package/lib/node/dev-null-stream.d.ts.map +1 -1
- package/lib/node/dev-null-stream.js +2 -6
- package/lib/node/dev-null-stream.js.map +1 -1
- package/lib/node/index.d.ts +6 -6
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +6 -9
- package/lib/node/index.js.map +1 -1
- package/lib/node/multi-ring-buffer.js +9 -14
- package/lib/node/multi-ring-buffer.js.map +1 -1
- package/lib/node/multi-ring-buffer.spec.js +31 -33
- package/lib/node/multi-ring-buffer.spec.js.map +1 -1
- package/lib/node/process-backend-module.js +26 -28
- package/lib/node/process-backend-module.js.map +1 -1
- package/lib/node/process-manager.d.ts +2 -2
- package/lib/node/process-manager.d.ts.map +1 -1
- package/lib/node/process-manager.js +12 -16
- package/lib/node/process-manager.js.map +1 -1
- package/lib/node/process.d.ts +1 -1
- package/lib/node/process.d.ts.map +1 -1
- package/lib/node/process.js +30 -34
- package/lib/node/process.js.map +1 -1
- package/lib/node/pseudo-pty.js +4 -8
- package/lib/node/pseudo-pty.js.map +1 -1
- package/lib/node/raw-process.d.ts +4 -4
- package/lib/node/raw-process.d.ts.map +1 -1
- package/lib/node/raw-process.js +27 -32
- package/lib/node/raw-process.js.map +1 -1
- package/lib/node/raw-process.spec.js +10 -12
- package/lib/node/raw-process.spec.js.map +1 -1
- package/lib/node/task-terminal-process.d.ts +1 -1
- package/lib/node/task-terminal-process.d.ts.map +1 -1
- package/lib/node/task-terminal-process.js +8 -11
- package/lib/node/task-terminal-process.js.map +1 -1
- package/lib/node/terminal-process.d.ts +5 -5
- package/lib/node/terminal-process.d.ts.map +1 -1
- package/lib/node/terminal-process.js +39 -44
- package/lib/node/terminal-process.js.map +1 -1
- package/lib/node/terminal-process.spec.js +11 -13
- package/lib/node/terminal-process.spec.js.map +1 -1
- package/lib/node/test/process-test-container.js +7 -10
- package/lib/node/test/process-test-container.js.map +1 -1
- package/lib/node/utils.js +7 -12
- package/lib/node/utils.js.map +1 -1
- package/package.json +12 -3
- package/src/common/process-common-module.ts +1 -1
- package/src/common/shell-command-builder.slow-spec.ts +3 -3
- package/src/common/shell-command-builder.ts +1 -1
- package/src/node/dev-null-stream.ts +1 -1
- package/src/node/index.ts +6 -6
- package/src/node/multi-ring-buffer.spec.ts +1 -1
- package/src/node/process-backend-module.ts +5 -5
- package/src/node/process-manager.ts +2 -2
- package/src/node/process.ts +2 -2
- package/src/node/raw-process.spec.ts +4 -4
- package/src/node/raw-process.ts +5 -5
- package/src/node/task-terminal-process.ts +1 -1
- package/src/node/terminal-process.spec.ts +4 -4
- package/src/node/terminal-process.ts +7 -7
- package/src/node/test/process-test-container.ts +1 -1
- package/src/node/utils.ts +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,44 +13,42 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
exports.TerminalProcessFactory = Symbol('TerminalProcessFactory');
|
|
33
|
-
var NodePtyErrors;
|
|
16
|
+
import { __decorate, __param } from "tslib";
|
|
17
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Disposable, DisposableCollection, Emitter, isWindows } from '@theia/core';
|
|
19
|
+
import { ILogger } from '@theia/core/lib/common';
|
|
20
|
+
import { Process, ProcessType, } from './process.js';
|
|
21
|
+
import { ProcessManager } from './process-manager.js';
|
|
22
|
+
import { spawn } from 'node-pty';
|
|
23
|
+
import { MultiRingBuffer } from './multi-ring-buffer.js';
|
|
24
|
+
import { DevNullStream } from './dev-null-stream.js';
|
|
25
|
+
import { signame } from './utils.js';
|
|
26
|
+
import { PseudoPty } from './pseudo-pty.js';
|
|
27
|
+
import { Writable } from 'stream';
|
|
28
|
+
export const TerminalProcessOptions = Symbol('TerminalProcessOptions');
|
|
29
|
+
export const TerminalProcessFactory = Symbol('TerminalProcessFactory');
|
|
30
|
+
export var NodePtyErrors;
|
|
34
31
|
(function (NodePtyErrors) {
|
|
35
32
|
NodePtyErrors["EACCES"] = "Permission denied";
|
|
36
33
|
NodePtyErrors["ENOENT"] = "No such file or directory";
|
|
37
|
-
})(NodePtyErrors || (
|
|
34
|
+
})(NodePtyErrors || (NodePtyErrors = {}));
|
|
38
35
|
/**
|
|
39
36
|
* Run arbitrary processes inside pseudo-terminals (PTY).
|
|
40
37
|
*
|
|
41
38
|
* Note: a PTY is not a shell process (bash/pwsh/cmd...)
|
|
42
39
|
*/
|
|
43
|
-
let TerminalProcess = class TerminalProcess extends
|
|
40
|
+
let TerminalProcess = class TerminalProcess extends Process {
|
|
44
41
|
constructor(options, processManager, ringBuffer, logger) {
|
|
45
|
-
super(processManager, logger,
|
|
42
|
+
super(processManager, logger, ProcessType.Terminal, options);
|
|
46
43
|
this.options = options;
|
|
47
44
|
this.ringBuffer = ringBuffer;
|
|
48
45
|
this.logger = logger;
|
|
49
46
|
this.outputStream = this.createOutputStream();
|
|
50
|
-
this.errorStream = new
|
|
47
|
+
this.errorStream = new DevNullStream({ autoDestroy: true });
|
|
51
48
|
if (options.isPseudo) {
|
|
52
49
|
// do not need to spawn a process, new a pseudo pty instead
|
|
53
|
-
this.terminal = new
|
|
54
|
-
this.inputStream = new
|
|
50
|
+
this.terminal = new PseudoPty();
|
|
51
|
+
this.inputStream = new DevNullStream({ autoDestroy: true });
|
|
55
52
|
return;
|
|
56
53
|
}
|
|
57
54
|
if (this.isForkOptions(this.options)) {
|
|
@@ -60,7 +57,7 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
|
|
|
60
57
|
this.logger.debug('Starting terminal process', JSON.stringify(options, undefined, 2));
|
|
61
58
|
// Delay resizes to avoid conpty not respecting very early resize calls
|
|
62
59
|
// see https://github.com/microsoft/vscode/blob/a1c783c/src/vs/platform/terminal/node/terminalProcess.ts#L177
|
|
63
|
-
if (
|
|
60
|
+
if (isWindows) {
|
|
64
61
|
this._delayedResizer = new DelayedResizer();
|
|
65
62
|
this._delayedResizer.onTrigger(dimensions => {
|
|
66
63
|
this._delayedResizer?.dispose();
|
|
@@ -80,7 +77,7 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
|
|
|
80
77
|
// situation.
|
|
81
78
|
const message = error.message;
|
|
82
79
|
if (message.startsWith('File not found: ') || message.endsWith(NodePtyErrors.ENOENT)) {
|
|
83
|
-
if (
|
|
80
|
+
if (isWindows && command && !command.toLowerCase().endsWith('.exe')) {
|
|
84
81
|
const commandExe = command + '.exe';
|
|
85
82
|
this.logger.debug(`Trying terminal command '${commandExe}' because '${command}' was not found.`);
|
|
86
83
|
return startTerminal(commandExe);
|
|
@@ -100,7 +97,7 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
|
|
|
100
97
|
// node-pty throws exceptions on Windows.
|
|
101
98
|
// Call the client error handler, but first give them a chance to register it.
|
|
102
99
|
this.emitOnErrorAsync(error);
|
|
103
|
-
return { terminal: undefined, inputStream: new
|
|
100
|
+
return { terminal: undefined, inputStream: new DevNullStream({ autoDestroy: true }) };
|
|
104
101
|
}
|
|
105
102
|
};
|
|
106
103
|
const { terminal, inputStream } = startTerminal(options.command);
|
|
@@ -116,7 +113,7 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
|
|
|
116
113
|
* @returns the terminal PTY and a stream by which it may be sent input
|
|
117
114
|
*/
|
|
118
115
|
createPseudoTerminal(command, options, ringBuffer) {
|
|
119
|
-
const terminal =
|
|
116
|
+
const terminal = spawn(command, (isWindows && options.commandLine) || options.args || [], options.options || {});
|
|
120
117
|
process.nextTick(() => this.emitOnStarted());
|
|
121
118
|
// node-pty actually wait for the underlying streams to be closed before emitting exit.
|
|
122
119
|
// We should emulate the `exit` and `close` sequence.
|
|
@@ -138,21 +135,21 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
|
|
|
138
135
|
this.onTerminalExit(exitCode, undefined);
|
|
139
136
|
}
|
|
140
137
|
else {
|
|
141
|
-
this.onTerminalExit(undefined,
|
|
138
|
+
this.onTerminalExit(undefined, signame(signal));
|
|
142
139
|
}
|
|
143
140
|
process.nextTick(() => {
|
|
144
141
|
if (signal === undefined || signal === 0) {
|
|
145
142
|
this.emitOnClose(exitCode, undefined);
|
|
146
143
|
}
|
|
147
144
|
else {
|
|
148
|
-
this.emitOnClose(undefined,
|
|
145
|
+
this.emitOnClose(undefined, signame(signal));
|
|
149
146
|
}
|
|
150
147
|
});
|
|
151
148
|
});
|
|
152
149
|
terminal.onData((data) => {
|
|
153
150
|
ringBuffer.enq(data);
|
|
154
151
|
});
|
|
155
|
-
const inputStream = new
|
|
152
|
+
const inputStream = new Writable({
|
|
156
153
|
write: (chunk) => {
|
|
157
154
|
this.write(chunk);
|
|
158
155
|
},
|
|
@@ -221,28 +218,26 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
|
|
|
221
218
|
}
|
|
222
219
|
}
|
|
223
220
|
};
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
(0,
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
tslib_1.__param(3, (0, inversify_1.named)('process:TerminalProcess')),
|
|
232
|
-
tslib_1.__metadata("design:paramtypes", [Object, process_manager_1.ProcessManager,
|
|
233
|
-
multi_ring_buffer_1.MultiRingBuffer, Object])
|
|
221
|
+
TerminalProcess = __decorate([
|
|
222
|
+
injectable(),
|
|
223
|
+
__param(0, inject(TerminalProcessOptions)),
|
|
224
|
+
__param(1, inject(ProcessManager)),
|
|
225
|
+
__param(2, inject(MultiRingBuffer)),
|
|
226
|
+
__param(3, inject(ILogger)),
|
|
227
|
+
__param(3, named('process:TerminalProcess'))
|
|
234
228
|
], TerminalProcess);
|
|
229
|
+
export { TerminalProcess };
|
|
235
230
|
/**
|
|
236
231
|
* Tracks the latest resize event to be trigger at a later point.
|
|
237
232
|
*/
|
|
238
|
-
class DelayedResizer extends
|
|
233
|
+
class DelayedResizer extends DisposableCollection {
|
|
239
234
|
get onTrigger() { return this._onTrigger.event; }
|
|
240
235
|
constructor() {
|
|
241
236
|
super();
|
|
242
|
-
this._onTrigger = new
|
|
237
|
+
this._onTrigger = new Emitter();
|
|
243
238
|
this.push(this._onTrigger);
|
|
244
239
|
this._timeout = setTimeout(() => this._onTrigger.fire({ rows: this.rows, cols: this.cols }), 1000);
|
|
245
|
-
this.push(
|
|
240
|
+
this.push(Disposable.create(() => clearTimeout(this._timeout)));
|
|
246
241
|
}
|
|
247
242
|
dispose() {
|
|
248
243
|
super.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-process.js","sourceRoot":"","sources":["../../src/node/terminal-process.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-process.js","sourceRoot":"","sources":["../../src/node/terminal-process.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAS,SAAS,EAAE,MAAM,aAAa,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,WAAW,GAA2C,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAQ,KAAK,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,eAAe,EAAiC,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AASvE,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAKvE,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACrB,6CAA4B,CAAA;IAC5B,qDAAoC,CAAA;AACxC,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAED;;;;GAIG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,OAAO;IAUxC,YACoC,OAA2D,EACnE,cAA8B,EAC7B,UAA8C,EAEvE,MAA2C;QAE3C,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAND,YAAO,GAAP,OAAO,CAAwB;QAE/C,eAAU,GAAV,UAAU,CAAiB;QAE3C,WAAM,GAAN,MAAM,CAAS;QATtC,iBAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACzC,gBAAW,GAAG,IAAI,aAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAY5D,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,2DAA2D;YAC3D,IAAI,CAAC,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QAEtF,uEAAuE;QACvE,6GAA6G;QAC7G,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,eAAe,GAAG,IAAI,cAAc,EAAE,CAAC;YAC5C,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;gBACxC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE,CAAC;gBAChC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;gBACjC,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;oBACrC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBAClD,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,OAAe,EAAyD,EAAE;YAC7F,IAAI,CAAC;gBACD,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACnE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,8DAA8D;gBAC9D,wDAAwD;gBACxD,aAAa;gBACb,MAAM,OAAO,GAAW,KAAK,CAAC,OAAO,CAAC;gBAEtC,IAAI,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnF,IAAI,SAAS,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;wBAClE,MAAM,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;wBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,UAAU,cAAc,OAAO,kBAAkB,CAAC,CAAC;wBACjG,OAAO,aAAa,CAAC,UAAU,CAAC,CAAC;oBACrC,CAAC;oBAED,sEAAsE;oBACtE,4CAA4C;oBAC5C,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;oBACvB,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;oBACtB,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;gBACjC,CAAC;qBAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChD,gEAAgE;oBAChE,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;oBACvB,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;oBACtB,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;gBACjC,CAAC;gBAED,yCAAyC;gBACzC,8EAA8E;gBAC9E,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAE7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,aAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YAC1F,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IAED;;;;;;;OAOG;IACK,oBAAoB,CAAC,OAAe,EAAE,OAA+B,EAAE,UAA2B;QACtG,MAAM,QAAQ,GAAG,KAAK,CAClB,OAAO,EACP,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,EAAE,EACxD,OAAO,CAAC,OAAO,IAAI,EAAE,CACxB,CAAC;QAEF,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAE7C,uFAAuF;QACvF,qDAAqD;QACrD,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE;YACrC,uDAAuD;YACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBACzB,QAAQ,GAAG,CAAC,CAAC;YACjB,CAAC;YACD,kEAAkE;YAClE,QAAQ;YACR,EAAE;YACF,oEAAoE;YACpE,iEAAiE;YACjE,gEAAgE;YAChE,+DAA+D;YAC/D,cAAc;YACd,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YACpD,CAAC;YACD,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE;gBAClB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAC1C,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;gBACjD,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE;YAC7B,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC;YAC7B,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE;gBACrB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;SACJ,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;IACrC,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,GAAG;QACH,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,QAAS,CAAC,GAAG,CAAC;IAC9B,CAAC;IAED,IAAI,UAAU;QACV,OAAQ,IAAI,CAAC,OAA0B,CAAC,OAAO,CAAC;IACpD,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;IACnC,CAAC;IAES,cAAc,CAAC,IAAwB,EAAE,MAA0B;QACzE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAED,iBAAiB;QACb,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,CAAC,MAAe;QAChB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAY,EAAE,IAAY;QAC7B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACrF,OAAO;QACX,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC;YACD,yFAAyF;YACzF,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAEzB,yBAAyB;YACzB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACvB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC;gBACjC,OAAO;YACX,CAAC;YAED,IAAI,CAAC,QAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,8CAA8C;YAC9C,kHAAkH;YAClH,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;gBAC5B,KAAK,CAAC,OAAO,KAAK,wBAAwB;gBAC1C,KAAK,CAAC,OAAO,KAAK,6CAA6C,EAAE,CAAC;gBAClE,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAY;QACd,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,QAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAES,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;CAEJ,CAAA;AAzNY,eAAe;IAD3B,UAAU,EAAE;IAYJ,WAAA,MAAM,CAAC,sBAAsB,CAAC,CAAA;IAC9B,WAAA,MAAM,CAAC,cAAc,CAAC,CAAA;IACtB,WAAA,MAAM,CAAC,eAAe,CAAC,CAAA;IACvB,WAAA,MAAM,CAAC,OAAO,CAAC,CAAA;IAAE,WAAA,KAAK,CAAC,yBAAyB,CAAC,CAAA;GAd7C,eAAe,CAyN3B;;AAED;;GAEG;AACH,MAAM,cAAe,SAAQ,oBAAoB;IAM7C,IAAI,SAAS,KAA8C,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAE1F;QACI,KAAK,EAAE,CAAC;QAJK,eAAU,GAAG,IAAI,OAAO,EAAoC,CAAC;QAK1E,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACnG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAEQ,OAAO;QACZ,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
// *****************************************************************************
|
|
4
2
|
// Copyright (C) 2017 Ericsson and others.
|
|
5
3
|
//
|
|
@@ -15,19 +13,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
13
|
//
|
|
16
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
17
15
|
// *****************************************************************************
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
16
|
+
import * as chai from 'chai';
|
|
17
|
+
import * as process from 'process';
|
|
18
|
+
import * as stream from 'stream';
|
|
19
|
+
import { createProcessTestContainer } from './test/process-test-container.js';
|
|
20
|
+
import { TerminalProcessFactory } from './terminal-process.js';
|
|
21
|
+
import { isWindows } from '@theia/core/lib/common/os';
|
|
24
22
|
/**
|
|
25
23
|
* Globals
|
|
26
24
|
*/
|
|
27
25
|
const expect = chai.expect;
|
|
28
26
|
let terminalProcessFactory;
|
|
29
27
|
beforeEach(() => {
|
|
30
|
-
terminalProcessFactory =
|
|
28
|
+
terminalProcessFactory = createProcessTestContainer().get(TerminalProcessFactory);
|
|
31
29
|
});
|
|
32
30
|
describe('TerminalProcess', function () {
|
|
33
31
|
this.timeout(20_000);
|
|
@@ -37,7 +35,7 @@ describe('TerminalProcess', function () {
|
|
|
37
35
|
proc.onError(resolve);
|
|
38
36
|
proc.onExit(resolve);
|
|
39
37
|
});
|
|
40
|
-
if (
|
|
38
|
+
if (isWindows) {
|
|
41
39
|
expect(error.code).eq('ENOENT');
|
|
42
40
|
}
|
|
43
41
|
else {
|
|
@@ -46,7 +44,7 @@ describe('TerminalProcess', function () {
|
|
|
46
44
|
});
|
|
47
45
|
it('test implicit .exe (Windows only)', async function () {
|
|
48
46
|
const match = /^(.+)\.exe$/.exec(process.execPath);
|
|
49
|
-
if (!
|
|
47
|
+
if (!isWindows || !match) {
|
|
50
48
|
this.skip();
|
|
51
49
|
}
|
|
52
50
|
const command = match[1];
|
|
@@ -60,11 +58,11 @@ describe('TerminalProcess', function () {
|
|
|
60
58
|
});
|
|
61
59
|
it('test error on trying to execute a directory', async function () {
|
|
62
60
|
const error = await new Promise((resolve, reject) => {
|
|
63
|
-
const proc = terminalProcessFactory({ command:
|
|
61
|
+
const proc = terminalProcessFactory({ command: import.meta.dirname });
|
|
64
62
|
proc.onError(resolve);
|
|
65
63
|
proc.onExit(resolve);
|
|
66
64
|
});
|
|
67
|
-
if (
|
|
65
|
+
if (isWindows) {
|
|
68
66
|
expect(error.code).eq('ENOENT');
|
|
69
67
|
}
|
|
70
68
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-process.spec.js","sourceRoot":"","sources":["../../src/node/terminal-process.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-process.spec.js","sourceRoot":"","sources":["../../src/node/terminal-process.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createProcessTestContainer = createProcessTestContainer;
|
|
4
1
|
// *****************************************************************************
|
|
5
2
|
// Copyright (C) 2017 Ericsson and others.
|
|
6
3
|
//
|
|
@@ -16,13 +13,13 @@ exports.createProcessTestContainer = createProcessTestContainer;
|
|
|
16
13
|
//
|
|
17
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
18
15
|
// *****************************************************************************
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
function createProcessTestContainer() {
|
|
23
|
-
const testContainer = new
|
|
24
|
-
|
|
25
|
-
testContainer.load(
|
|
16
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
17
|
+
import { bindLogger } from '@theia/core/lib/node/logger-backend-module';
|
|
18
|
+
import processBackendModule from '../process-backend-module.js';
|
|
19
|
+
export function createProcessTestContainer() {
|
|
20
|
+
const testContainer = new Container();
|
|
21
|
+
bindLogger(testContainer.bind.bind(testContainer));
|
|
22
|
+
testContainer.load(processBackendModule);
|
|
26
23
|
return testContainer;
|
|
27
24
|
}
|
|
28
25
|
//# sourceMappingURL=process-test-container.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-test-container.js","sourceRoot":"","sources":["../../../src/node/test/process-test-container.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-test-container.js","sourceRoot":"","sources":["../../../src/node/test/process-test-container.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,oBAAoB,MAAM,8BAA8B,CAAC;AAEhE,MAAM,UAAU,0BAA0B;IACtC,MAAM,aAAa,GAAG,IAAI,SAAS,EAAE,CAAC;IAEtC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IACnD,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAEzC,OAAO,aAAa,CAAC;AACzB,CAAC"}
|
package/lib/node/utils.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,18 +13,14 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
exports.codename = codename;
|
|
21
|
-
const core_1 = require("@theia/core");
|
|
22
|
-
const os = require("os");
|
|
23
|
-
const stringArgv = require('string-argv');
|
|
16
|
+
import { isWindows } from '@theia/core';
|
|
17
|
+
import * as os from 'os';
|
|
18
|
+
import stringArgv from 'string-argv';
|
|
24
19
|
/**
|
|
25
20
|
* Parses the given line into an array of args respecting escapes and string literals.
|
|
26
21
|
* @param line the given line to parse
|
|
27
22
|
*/
|
|
28
|
-
function parseArgs(line) {
|
|
23
|
+
export function parseArgs(line) {
|
|
29
24
|
if (line) {
|
|
30
25
|
return stringArgv(line);
|
|
31
26
|
}
|
|
@@ -48,10 +43,10 @@ function objectEntries(obj) {
|
|
|
48
43
|
* only valid for the x86 and ARM architectures, since other architectures may
|
|
49
44
|
* use different numbers, see signal(7).
|
|
50
45
|
*/
|
|
51
|
-
function signame(sig) {
|
|
46
|
+
export function signame(sig) {
|
|
52
47
|
// We should never reach this on Windows, since signals are not a thing
|
|
53
48
|
// there.
|
|
54
|
-
if (
|
|
49
|
+
if (isWindows) {
|
|
55
50
|
throw new Error('Trying to get a signal name on Windows.');
|
|
56
51
|
}
|
|
57
52
|
for (const entry of objectEntries(os.constants.signals)) {
|
|
@@ -65,7 +60,7 @@ function signame(sig) {
|
|
|
65
60
|
/**
|
|
66
61
|
* Convert a code number to its short name
|
|
67
62
|
*/
|
|
68
|
-
function codename(code) {
|
|
63
|
+
export function codename(code) {
|
|
69
64
|
for (const entry of objectEntries(os.constants.errno)) {
|
|
70
65
|
if (entry[1] === code) {
|
|
71
66
|
return entry[0];
|
package/lib/node/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/node/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/node/utils.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAC,IAAwB;IAC9C,IAAI,IAAI,EAAE,CAAC;QACP,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,2DAA2D;AAC3D,8DAA8D;AAC9D,SAAS,aAAa,CAAC,GAAQ;IAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,8DAA8D;QAC9D,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAC,GAAW;IAC/B,uEAAuE;IACvE,SAAS;IACT,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IAED,0DAA0D;IAC1D,OAAO,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,IAAY;IACjC,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IACD,gEAAgE;IAChE,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/process",
|
|
3
|
-
"version": "1.77.0-next.
|
|
3
|
+
"version": "1.77.0-next.108+30a548238",
|
|
4
4
|
"description": "Theia process support.",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.77.0-next.
|
|
7
|
+
"@theia/core": "1.77.0-next.108+30a548238",
|
|
7
8
|
"node-pty": "1.2.0-beta.12",
|
|
8
9
|
"string-argv": "^0.1.2",
|
|
9
10
|
"tslib": "^2.8.1"
|
|
@@ -50,5 +51,13 @@
|
|
|
50
51
|
"nyc": {
|
|
51
52
|
"extends": "../../configs/nyc.json"
|
|
52
53
|
},
|
|
53
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "30a5482386400715f42b541b4b142fd399ada7f3",
|
|
55
|
+
"exports": {
|
|
56
|
+
"./package.json": "./package.json",
|
|
57
|
+
"./lib/node": "./lib/node/index.js",
|
|
58
|
+
"./lib/*.json": "./lib/*.json",
|
|
59
|
+
"./lib/*.js": "./lib/*.js",
|
|
60
|
+
"./lib/*": "./lib/*.js",
|
|
61
|
+
"./*": "./*"
|
|
62
|
+
}
|
|
54
63
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ShellCommandBuilder } from './shell-command-builder';
|
|
18
|
+
import { ShellCommandBuilder } from './shell-command-builder.js';
|
|
19
19
|
|
|
20
20
|
export default new ContainerModule((bind, unbind, isBound, rebind) => {
|
|
21
21
|
bind(ShellCommandBuilder).toSelf().inSingletonScope();
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
import { spawn, execSync, SpawnOptions, ChildProcess, spawnSync } from 'child_process';
|
|
22
22
|
import { Readable } from 'stream';
|
|
23
23
|
import { join } from 'path';
|
|
24
|
-
import { ShellCommandBuilder, CommandLineOptions, ProcessInfo } from './shell-command-builder';
|
|
25
|
-
import
|
|
24
|
+
import { ShellCommandBuilder, CommandLineOptions, ProcessInfo } from './shell-command-builder.js';
|
|
25
|
+
import chalk from 'chalk';
|
|
26
26
|
|
|
27
27
|
export interface TestProcessInfo extends ProcessInfo {
|
|
28
28
|
shell: ChildProcess
|
|
@@ -52,7 +52,7 @@ function debug(...parts: any[]): void {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
const testResources = join(
|
|
55
|
+
const testResources = join(import.meta.dirname, '../../src/common/tests');
|
|
56
56
|
const spawnOptions: SpawnOptions = {
|
|
57
57
|
// We do our own quoting, don't rely on the one done by NodeJS:
|
|
58
58
|
windowsVerbatimArguments: true,
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
import { injectable } from '@theia/core/shared/inversify';
|
|
25
25
|
import {
|
|
26
26
|
createShellCommandLine, BashQuotingFunctions, PowershellQuotingFunctions, CmdQuotingFunctions, ShellQuoting, ShellQuotedString, escapeForShell, ShellQuotingFunctions
|
|
27
|
-
} from '../common/shell-quoting';
|
|
27
|
+
} from '../common/shell-quoting.js';
|
|
28
28
|
|
|
29
29
|
export interface ProcessInfo {
|
|
30
30
|
executable: string
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import stream
|
|
17
|
+
import * as stream from 'stream';
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
20
|
* A Node stream like `/dev/null`.
|
package/src/node/index.ts
CHANGED
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
export * from './process-manager';
|
|
18
|
-
export * from './process';
|
|
19
|
-
export * from './raw-process';
|
|
20
|
-
export * from './terminal-process';
|
|
21
|
-
export * from './task-terminal-process';
|
|
22
|
-
export * from './multi-ring-buffer';
|
|
17
|
+
export * from './process-manager.js';
|
|
18
|
+
export * from './process.js';
|
|
19
|
+
export * from './raw-process.js';
|
|
20
|
+
export * from './terminal-process.js';
|
|
21
|
+
export * from './task-terminal-process.js';
|
|
22
|
+
export * from './multi-ring-buffer.js';
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import * as chai from 'chai';
|
|
18
|
-
import { MultiRingBuffer } from './multi-ring-buffer';
|
|
18
|
+
import { MultiRingBuffer } from './multi-ring-buffer.js';
|
|
19
19
|
|
|
20
20
|
const expect = chai.expect;
|
|
21
21
|
|
|
@@ -15,12 +15,12 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { ContainerModule, Container } from '@theia/core/shared/inversify';
|
|
18
|
-
import { RawProcess, RawProcessOptions, RawProcessFactory, RawForkOptions } from './raw-process';
|
|
19
|
-
import { TerminalProcess, TerminalProcessOptions, TerminalProcessFactory } from './terminal-process';
|
|
20
|
-
import { TaskTerminalProcess, TaskTerminalProcessFactory } from './task-terminal-process';
|
|
18
|
+
import { RawProcess, RawProcessOptions, RawProcessFactory, RawForkOptions } from './raw-process.js';
|
|
19
|
+
import { TerminalProcess, TerminalProcessOptions, TerminalProcessFactory } from './terminal-process.js';
|
|
20
|
+
import { TaskTerminalProcess, TaskTerminalProcessFactory } from './task-terminal-process.js';
|
|
21
21
|
import { BackendApplicationContribution } from '@theia/core/lib/node';
|
|
22
|
-
import { ProcessManager } from './process-manager';
|
|
23
|
-
import { MultiRingBuffer, MultiRingBufferOptions } from './multi-ring-buffer';
|
|
22
|
+
import { ProcessManager } from './process-manager.js';
|
|
23
|
+
import { MultiRingBuffer, MultiRingBufferOptions } from './multi-ring-buffer.js';
|
|
24
24
|
|
|
25
25
|
export default new ContainerModule(bind => {
|
|
26
26
|
bind(RawProcess).toSelf().inTransientScope();
|
|
@@ -17,9 +17,9 @@ import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
|
17
17
|
import { Emitter, Event } from '@theia/core/lib/common';
|
|
18
18
|
import { ILogger } from '@theia/core/lib/common/logger';
|
|
19
19
|
import { BackendApplicationContribution } from '@theia/core/lib/node';
|
|
20
|
-
import { ManagedProcessManager, ManagedProcess } from '../common/process-manager-types';
|
|
20
|
+
import { ManagedProcessManager, ManagedProcess } from '../common/process-manager-types.js';
|
|
21
21
|
import { MAX_SAFE_INTEGER } from '@theia/core/lib/common/numbers';
|
|
22
|
-
import { Process } from './process';
|
|
22
|
+
import { Process } from './process.js';
|
|
23
23
|
|
|
24
24
|
@injectable()
|
|
25
25
|
export class ProcessManager implements ManagedProcessManager, BackendApplicationContribution {
|
package/src/node/process.ts
CHANGED
|
@@ -21,7 +21,7 @@ import { isOSX, isWindows } from '@theia/core';
|
|
|
21
21
|
import { Readable, Writable } from 'stream';
|
|
22
22
|
import { exec } from 'child_process';
|
|
23
23
|
import * as fs from 'fs';
|
|
24
|
-
import { IProcessStartEvent, IProcessExitEvent, ProcessErrorEvent, ProcessType, ManagedProcessManager, ManagedProcess } from '../common/process-manager-types';
|
|
24
|
+
import { IProcessStartEvent, IProcessExitEvent, ProcessErrorEvent, ProcessType, ManagedProcessManager, ManagedProcess } from '../common/process-manager-types.js';
|
|
25
25
|
export { IProcessStartEvent, IProcessExitEvent, ProcessErrorEvent, ProcessType };
|
|
26
26
|
|
|
27
27
|
/**
|
|
@@ -92,7 +92,7 @@ export abstract class Process implements ManagedProcess {
|
|
|
92
92
|
@unmanaged() protected readonly options: ProcessOptions | ForkOptions
|
|
93
93
|
) {
|
|
94
94
|
this.id = this.processManager.register(this);
|
|
95
|
-
this.initialCwd = options && options.options && 'cwd' in options.options && options.options['cwd'].toString() ||
|
|
95
|
+
this.initialCwd = options && options.options && 'cwd' in options.options && options.options['cwd'].toString() || import.meta.dirname;
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
abstract kill(signal?: string): void;
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
import * as chai from 'chai';
|
|
17
17
|
import * as process from 'process';
|
|
18
18
|
import * as stream from 'stream';
|
|
19
|
-
import { createProcessTestContainer } from './test/process-test-container';
|
|
20
|
-
import { RawProcessFactory } from './raw-process';
|
|
19
|
+
import { createProcessTestContainer } from './test/process-test-container.js';
|
|
20
|
+
import { RawProcessFactory } from './raw-process.js';
|
|
21
21
|
import * as temp from 'temp';
|
|
22
22
|
import * as fs from 'fs';
|
|
23
23
|
import * as path from 'path';
|
|
24
|
-
import { IProcessStartEvent, ProcessErrorEvent } from './process';
|
|
24
|
+
import { IProcessStartEvent, ProcessErrorEvent } from './process.js';
|
|
25
25
|
|
|
26
26
|
/* Allow to create temporary files, but delete them when we're done. */
|
|
27
27
|
const track = temp.track();
|
|
@@ -31,7 +31,7 @@ const track = temp.track();
|
|
|
31
31
|
*/
|
|
32
32
|
|
|
33
33
|
const expect = chai.expect;
|
|
34
|
-
const FORK_TEST_FILE = path.join(
|
|
34
|
+
const FORK_TEST_FILE = path.join(import.meta.dirname, '../../src/node/test/process-fork-test.js');
|
|
35
35
|
|
|
36
36
|
describe('RawProcess', function (): void {
|
|
37
37
|
|
package/src/node/raw-process.ts
CHANGED
|
@@ -15,15 +15,15 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
|
-
import { ProcessManager } from './process-manager';
|
|
18
|
+
import { ProcessManager } from './process-manager.js';
|
|
19
19
|
import { ILogger } from '@theia/core/lib/common';
|
|
20
|
-
import { Process, ProcessType, ProcessOptions, ForkOptions, ProcessErrorEvent } from './process';
|
|
20
|
+
import { Process, ProcessType, ProcessOptions, ForkOptions, ProcessErrorEvent } from './process.js';
|
|
21
21
|
import { ChildProcess, spawn, fork } from 'child_process';
|
|
22
22
|
import * as stream from 'stream';
|
|
23
23
|
|
|
24
24
|
// The class was here before, exporting to not break anything.
|
|
25
|
-
export { DevNullStream } from './dev-null-stream';
|
|
26
|
-
import { DevNullStream } from './dev-null-stream';
|
|
25
|
+
export { DevNullStream } from './dev-null-stream.js';
|
|
26
|
+
import { DevNullStream } from './dev-null-stream.js';
|
|
27
27
|
|
|
28
28
|
export const RawProcessOptions = Symbol('RawProcessOptions');
|
|
29
29
|
|
|
@@ -66,7 +66,7 @@ export class RawProcess extends Process {
|
|
|
66
66
|
readonly errorStream: stream.Readable;
|
|
67
67
|
readonly inputStream: stream.Writable;
|
|
68
68
|
|
|
69
|
-
constructor( // eslint-disable-next-line @
|
|
69
|
+
constructor( // eslint-disable-next-line @stylistic/indent
|
|
70
70
|
@inject(RawProcessOptions) options: RawProcessOptions | RawForkOptions,
|
|
71
71
|
@inject(ProcessManager) processManager: ProcessManager,
|
|
72
72
|
@inject(ILogger) @named('process:RawProcess')
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TerminalProcess, TerminalProcessOptions } from './terminal-process';
|
|
18
|
+
import { TerminalProcess, TerminalProcessOptions } from './terminal-process.js';
|
|
19
19
|
|
|
20
20
|
export const TaskTerminalProcessFactory = Symbol('TaskTerminalProcessFactory');
|
|
21
21
|
export interface TaskTerminalProcessFactory {
|