@theia/process 1.40.1 → 1.41.0

package/lib/node/terminal-process.d.ts

@@ -31,11 +31,22 @@ export declare class TerminalProcess extends Process {
     protected readonly options: TerminalProcessOptions;
     protected readonly ringBuffer: MultiRingBuffer;
     protected readonly terminal: IPty | undefined;
+    private _delayedResizer;
+    private _exitCode;
     readonly outputStream: MultiRingBufferReadableStream;
     readonly errorStream: DevNullStream;
     readonly inputStream: Writable;
     constructor(// eslint-disable-next-line @typescript-eslint/indent
     options: TerminalProcessOptions, processManager: ProcessManager, ringBuffer: MultiRingBuffer, logger: ILogger);
+    /**
+     * Helper for the constructor to attempt to create the pseudo-terminal encapsulating the shell process.
+     *
+     * @param command the shell command to launch
+     * @param options options for the shell process
+     * @param ringBuffer a ring buffer in which to collect terminal output
+     * @returns the terminal PTY and a stream by which it may be sent input
+     */
+    private createPseudoTerminal;
     createOutputStream(): MultiRingBufferReadableStream;
     get pid(): number;
     get executable(): string;

package/lib/node/terminal-process.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-process.d.ts","sourceRoot":"","sources":["../../src/node/terminal-process.ts"],"names":[],"mappings":";AAkBA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAe,cAAc,EAA2B,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAS,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC1D;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,WAAW,sBAAsB;IACnC,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAAC;CACtD;AAED,oBAAY,aAAa;IACrB,MAAM,sBAAsB;IAC5B,MAAM,8BAA8B;CACvC;AAED;;;;GAIG;AACH,qBACa,eAAgB,SAAQ,OAAO;uBASwB,OAAO,EAAE,sBAAsB;IAElE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAe;IAT3E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;IAE9C,QAAQ,CAAC,YAAY,gCAA6B;IAClD,QAAQ,CAAC,WAAW,gBAA4C;IAChE,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;gBAElB,qDAAqD;IACF,OAAO,EAAE,sBAAsB,EACnE,cAAc,EAAE,cAAc,EACV,UAAU,EAAE,eAAe,EACpC,MAAM,EAAE,OAAO;IAoFtD,kBAAkB,IAAI,6BAA6B;IAInD,IAAI,GAAG,IAAI,MAAM,CAGhB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,SAAS,IAAI,MAAM,EAAE,CAExB;IAED,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKpF,iBAAiB,IAAI,IAAI;IAIzB,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAM3B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKzB,SAAS,CAAC,aAAa,IAAI,IAAI,GAAG,KAAK;CAM1C"}
+{"version":3,"file":"terminal-process.d.ts","sourceRoot":"","sources":["../../src/node/terminal-process.ts"],"names":[],"mappings":";AAkBA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAe,cAAc,EAA2B,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAS,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC1D;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,MAAM,WAAW,sBAAsB;IACnC,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAAC;CACtD;AAED,oBAAY,aAAa;IACrB,MAAM,sBAAsB;IAC5B,MAAM,8BAA8B;CACvC;AAED;;;;GAIG;AACH,qBACa,eAAgB,SAAQ,OAAO;uBAWwB,OAAO,EAAE,sBAAsB;IAElE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAe;IAX3E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;IAC9C,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,SAAS,CAAqB;IAEtC,QAAQ,CAAC,YAAY,gCAA6B;IAClD,QAAQ,CAAC,WAAW,gBAA4C;IAChE,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;gBAElB,qDAAqD;IACF,OAAO,EAAE,sBAAsB,EACnE,cAAc,EAAE,cAAc,EACV,UAAU,EAAE,eAAe,EACpC,MAAM,EAAE,OAAO;IAsEtD;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;IAgD5B,kBAAkB,IAAI,6BAA6B;IAInD,IAAI,GAAG,IAAI,MAAM,CAGhB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,SAAS,IAAI,MAAM,EAAE,CAExB;IAED,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAKpF,iBAAiB,IAAI,IAAI;IAIzB,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAM3B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IA6BxC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKzB,SAAS,CAAC,aAAa,IAAI,IAAI,GAAG,KAAK;CAM1C"}

package/lib/node/terminal-process.js

@@ -69,64 +69,103 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
             throw new Error('terminal processes cannot be forked as of today');
         }
         this.logger.debug('Starting terminal process', JSON.stringify(options, undefined, 2));
-        try {
-            this.terminal = (0, node_pty_1.spawn)(options.command, (core_1.isWindows && options.commandLine) || options.args || [], options.options || {});
-            process.nextTick(() => this.emitOnStarted());
-            // node-pty actually wait for the underlying streams to be closed before emitting exit.
-            // We should emulate the `exit` and `close` sequence.
-            this.terminal.on('exit', (code, signal) => {
-                // Make sure to only pass either code or signal as !undefined, not
-                // both.
-                //
-                // node-pty quirk: On Linux/macOS, if the process exited through the
-                // exit syscall (with an exit code), signal will be 0 (an invalid
-                // signal value).  If it was terminated because of a signal, the
-                // signal parameter will hold the signal number and code should
-                // be ignored.
-                if (signal === undefined || signal === 0) {
-                    this.onTerminalExit(code, undefined);
+        // Delay resizes to avoid conpty not respecting very early resize calls
+        // see https://github.com/microsoft/vscode/blob/a1c783c/src/vs/platform/terminal/node/terminalProcess.ts#L177
+        if (core_1.isWindows) {
+            this._delayedResizer = new DelayedResizer();
+            this._delayedResizer.onTrigger(dimensions => {
+                var _a;
+                (_a = this._delayedResizer) === null || _a === void 0 ? void 0 : _a.dispose();
+                this._delayedResizer = undefined;
+                if (dimensions.cols && dimensions.rows) {
+                    this.resize(dimensions.cols, dimensions.rows);
                 }
-                else {
-                    this.onTerminalExit(undefined, (0, utils_1.signame)(signal));
-                }
-                process.nextTick(() => {
-                    if (signal === undefined || signal === 0) {
-                        this.emitOnClose(code, undefined);
-                    }
-                    else {
-                        this.emitOnClose(undefined, (0, utils_1.signame)(signal));
-                    }
-                });
-            });
-            this.terminal.on('data', (data) => {
-                ringBuffer.enq(data);
-            });
-            this.inputStream = new stream_1.Writable({
-                write: (chunk) => {
-                    this.write(chunk);
-                },
             });
         }
-        catch (error) {
-            this.inputStream = new dev_null_stream_1.DevNullStream({ autoDestroy: true });
-            // Normalize the error to make it as close as possible as what
-            // node's child_process.spawn would generate in the same
-            // situation.
-            const message = error.message;
-            if (message.startsWith('File not found: ') || message.endsWith(NodePtyErrors.ENOENT)) {
-                error.errno = 'ENOENT';
-                error.code = 'ENOENT';
-                error.path = options.command;
+        const startTerminal = (command) => {
+            try {
+                return this.createPseudoTerminal(command, options, ringBuffer);
+            }
+            catch (error) {
+                // Normalize the error to make it as close as possible as what
+                // node's child_process.spawn would generate in the same
+                // situation.
+                const message = error.message;
+                if (message.startsWith('File not found: ') || message.endsWith(NodePtyErrors.ENOENT)) {
+                    if (core_1.isWindows && command && !command.toLowerCase().endsWith('.exe')) {
+                        const commandExe = command + '.exe';
+                        this.logger.debug(`Trying terminal command '${commandExe}' because '${command}' was not found.`);
+                        return startTerminal(commandExe);
+                    }
+                    // Proceed with failure, reporting the original command because it was
+                    // the intended command and it was not found
+                    error.errno = 'ENOENT';
+                    error.code = 'ENOENT';
+                    error.path = options.command;
+                }
+                else if (message.endsWith(NodePtyErrors.EACCES)) {
+                    // The shell program exists but was not accessible, so just fail
+                    error.errno = 'EACCES';
+                    error.code = 'EACCES';
+                    error.path = options.command;
+                }
+                // node-pty throws exceptions on Windows.
+                // Call the client error handler, but first give them a chance to register it.
+                this.emitOnErrorAsync(error);
+                return { terminal: undefined, inputStream: new dev_null_stream_1.DevNullStream({ autoDestroy: true }) };
+            }
+        };
+        const { terminal, inputStream } = startTerminal(options.command);
+        this.terminal = terminal;
+        this.inputStream = inputStream;
+    }
+    /**
+     * Helper for the constructor to attempt to create the pseudo-terminal encapsulating the shell process.
+     *
+     * @param command the shell command to launch
+     * @param options options for the shell process
+     * @param ringBuffer a ring buffer in which to collect terminal output
+     * @returns the terminal PTY and a stream by which it may be sent input
+     */
+    createPseudoTerminal(command, options, ringBuffer) {
+        const terminal = (0, node_pty_1.spawn)(command, (core_1.isWindows && options.commandLine) || options.args || [], options.options || {});
+        process.nextTick(() => this.emitOnStarted());
+        // node-pty actually wait for the underlying streams to be closed before emitting exit.
+        // We should emulate the `exit` and `close` sequence.
+        terminal.onExit(({ exitCode, signal }) => {
+            // Make sure to only pass either code or signal as !undefined, not
+            // both.
+            //
+            // node-pty quirk: On Linux/macOS, if the process exited through the
+            // exit syscall (with an exit code), signal will be 0 (an invalid
+            // signal value).  If it was terminated because of a signal, the
+            // signal parameter will hold the signal number and code should
+            // be ignored.
+            this._exitCode = exitCode;
+            if (signal === undefined || signal === 0) {
+                this.onTerminalExit(exitCode, undefined);
             }
-            else if (message.endsWith(NodePtyErrors.EACCES)) {
-                error.errno = 'EACCES';
-                error.code = 'EACCES';
-                error.path = options.command;
+            else {
+                this.onTerminalExit(undefined, (0, utils_1.signame)(signal));
             }
-            // node-pty throws exceptions on Windows.
-            // Call the client error handler, but first give them a chance to register it.
-            this.emitOnErrorAsync(error);
-        }
+            process.nextTick(() => {
+                if (signal === undefined || signal === 0) {
+                    this.emitOnClose(exitCode, undefined);
+                }
+                else {
+                    this.emitOnClose(undefined, (0, utils_1.signame)(signal));
+                }
+            });
+        });
+        terminal.onData((data) => {
+            ringBuffer.enq(data);
+        });
+        const inputStream = new stream_1.Writable({
+            write: (chunk) => {
+                this.write(chunk);
+            },
+        });
+        return { terminal, inputStream };
     }
     createOutputStream() {
         return this.ringBuffer.getStream();
@@ -154,8 +193,31 @@ let TerminalProcess = class TerminalProcess extends process_1.Process {
         }
     }
     resize(cols, rows) {
+        if (typeof cols !== 'number' || typeof rows !== 'number' || isNaN(cols) || isNaN(rows)) {
+            return;
+        }
         this.checkTerminal();
-        this.terminal.resize(cols, rows);
+        try {
+            // Ensure that cols and rows are always >= 1, this prevents a native exception in winpty.
+            cols = Math.max(cols, 1);
+            rows = Math.max(rows, 1);
+            // Delay resize if needed
+            if (this._delayedResizer) {
+                this._delayedResizer.cols = cols;
+                this._delayedResizer.rows = rows;
+                return;
+            }
+            this.terminal.resize(cols, rows);
+        }
+        catch (error) {
+            // swallow error if the pty has already exited
+            // see also https://github.com/microsoft/vscode/blob/a1c783c/src/vs/platform/terminal/node/terminalProcess.ts#L549
+            if (this._exitCode !== undefined &&
+                error.message !== 'ioctl(2) failed, EBADF' &&
+                error.message !== 'Cannot resize a pty that has already exited') {
+                throw error;
+            }
+        }
     }
     write(data) {
         this.checkTerminal();
@@ -178,4 +240,21 @@ TerminalProcess = __decorate([
         multi_ring_buffer_1.MultiRingBuffer, Object])
 ], TerminalProcess);
 exports.TerminalProcess = TerminalProcess;
+/**
+ * Tracks the latest resize event to be trigger at a later point.
+ */
+class DelayedResizer extends core_1.DisposableCollection {
+    constructor() {
+        super();
+        this._onTrigger = new core_1.Emitter();
+        this.push(this._onTrigger);
+        this._timeout = setTimeout(() => this._onTrigger.fire({ rows: this.rows, cols: this.cols }), 1000);
+        this.push(core_1.Disposable.create(() => clearTimeout(this._timeout)));
+    }
+    get onTrigger() { return this._onTrigger.event; }
+    dispose() {
+        super.dispose();
+        clearTimeout(this._timeout);
+    }
+}
 //# sourceMappingURL=terminal-process.js.map

package/lib/node/terminal-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-process.js","sourceRoot":"","sources":["../../src/node/terminal-process.ts"],"names":[],"mappings":"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"}
+{"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,4DAAyE;AACzE,sCAA0F;AAC1F,mDAAiD;AACjD,uCAA0F;AAC1F,uDAAmD;AACnD,uCAAuC;AACvC,2DAAqF;AACrF,uDAAkD;AAClD,mCAAkC;AAClC,6CAAyC;AACzC,mCAAkC;AAErB,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAS1D,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAKvE,IAAY,aAGX;AAHD,WAAY,aAAa;IACrB,6CAA4B,CAAA;IAC5B,qDAAoC,CAAA;AACxC,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAED;;;;GAIG;AAEH,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,iBAAO;IAUxC,YAAa,qDAAqD;IACF,OAA+B,EACnE,cAA8B,EACV,UAA2B,EACpC,MAAe;QAElD,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,qBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QALD,YAAO,GAAP,OAAO,CAAwB;QAE/C,eAAU,GAAV,UAAU,CAAiB;QAPlE,iBAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACzC,gBAAW,GAAG,IAAI,+BAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAW5D,IAAI,OAAO,CAAC,QAAQ,EAAE;YAClB,2DAA2D;YAC3D,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAS,EAAE,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,IAAI,+BAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,OAAO;SACV;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;SACtE;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,gBAAS,EAAE;YACX,IAAI,CAAC,eAAe,GAAG,IAAI,cAAc,EAAE,CAAC;YAC5C,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;;gBACxC,MAAA,IAAI,CAAC,eAAe,0CAAE,OAAO,EAAE,CAAC;gBAChC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;gBACjC,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE;oBACpC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;iBACjD;YACL,CAAC,CAAC,CAAC;SACN;QAED,MAAM,aAAa,GAAG,CAAC,OAAe,EAAyD,EAAE;YAC7F,IAAI;gBACA,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;aAClE;YAAC,OAAO,KAAK,EAAE;gBACZ,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;oBAClF,IAAI,gBAAS,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;wBACjE,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;qBACpC;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;iBAChC;qBAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;oBAC/C,gEAAgE;oBAChE,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC;oBACvB,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;oBACtB,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;iBAChC;gBAED,yCAAyC;gBACzC,8EAA8E;gBAC9E,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAE7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,+BAAa,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;aACzF;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,IAAA,gBAAK,EAClB,OAAO,EACP,CAAC,gBAAS,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,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;gBACtC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;aAC5C;iBAAM;gBACH,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,IAAA,eAAO,EAAC,MAAM,CAAC,CAAC,CAAC;aACnD;YACD,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE;gBAClB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,CAAC,EAAE;oBACtC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;iBACzC;qBAAM;oBACH,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAA,eAAO,EAAC,MAAM,CAAC,CAAC,CAAC;iBAChD;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,iBAAQ,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;YACxC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC9B;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;YACpF,OAAO;SACV;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI;YACA,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;gBACtB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC;gBACjC,OAAO;aACV;YAED,IAAI,CAAC,QAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACZ,8CAA8C;YAC9C,kHAAkH;YAClH,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;gBAC5B,KAAK,CAAC,OAAO,KAAK,wBAAwB;gBAC1C,KAAK,CAAC,OAAO,KAAK,6CAA6C,EAAE;gBACjE,MAAM,KAAK,CAAC;aACf;SACJ;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;YAChB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SAC1D;IACL,CAAC;CAEJ,CAAA;AApNY,eAAe;IAD3B,IAAA,sBAAU,GAAE;IAYJ,WAAA,IAAA,kBAAM,EAAC,8BAAsB,CAAC,CAAA;IAC9B,WAAA,IAAA,kBAAM,EAAC,gCAAc,CAAC,CAAA;IACtB,WAAA,IAAA,kBAAM,EAAC,mCAAe,CAAC,CAAA;IACvB,WAAA,IAAA,kBAAM,EAAC,gBAAO,CAAC,CAAA;IAAE,WAAA,IAAA,iBAAK,EAAC,SAAS,CAAC,CAAA;6CAFM,gCAAc;QACE,mCAAe;GAblE,eAAe,CAoN3B;AApNY,0CAAe;AAsN5B;;GAEG;AACH,MAAM,cAAe,SAAQ,2BAAoB;IAQ7C;QACI,KAAK,EAAE,CAAC;QAJK,eAAU,GAAG,IAAI,cAAO,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,iBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAPD,IAAI,SAAS,KAA8C,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IASjF,OAAO;QACZ,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACJ"}

package/lib/node/terminal-process.spec.js

@@ -40,6 +40,20 @@ describe('TerminalProcess', function () {
         });
         expect(error.code).eq('ENOENT');
     });
+    it('test implicit .exe (Windows only)', async function () {
+        const match = /^(.+)\.exe$/.exec(process.execPath);
+        if (!os_1.isWindows || !match) {
+            this.skip();
+        }
+        const command = match[1];
+        const args = ['--version'];
+        const terminal = await new Promise((resolve, reject) => {
+            const proc = terminalProcessFactory({ command, args });
+            proc.onExit(resolve);
+            proc.onError(reject);
+        });
+        expect(terminal.code).to.exist;
+    });
     it('test error on trying to execute a directory', async function () {
         const error = await new Promise((resolve, reject) => {
             const proc = terminalProcessFactory({ command: __dirname });

package/lib/node/terminal-process.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-process.spec.js","sourceRoot":"","sources":["../../src/node/terminal-process.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-process.spec.js","sourceRoot":"","sources":["../../src/node/terminal-process.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/process",
-  "version": "1.40.1",
+  "version": "1.41.0",
   "description": "Theia process support.",
   "dependencies": {
-    "@theia/core": "1.40.1",
+    "@theia/core": "1.41.0",
     "node-pty": "0.11.0-beta17",
     "string-argv": "^0.1.1"
   },
@@ -44,10 +44,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.40.1"
+    "@theia/ext-scripts": "1.41.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "92c1db6be117d2606c0ed4de6ea6e51cf8e9fbc8"
+  "gitHead": "180103ad086fc0a5e4e5fc01b5fcb43f06019eb1"
 }

package/src/node/terminal-process.spec.ts

@@ -48,6 +48,23 @@ describe('TerminalProcess', function (): void {
         expect(error.code).eq('ENOENT');
     });
 
+    it('test implicit .exe (Windows only)', async function (): Promise<void> {
+        const match = /^(.+)\.exe$/.exec(process.execPath);
+        if (!isWindows || !match) {
+            this.skip();
+        }
+
+        const command = match[1];
+        const args = ['--version'];
+        const terminal = await new Promise<IProcessExitEvent>((resolve, reject) => {
+            const proc = terminalProcessFactory({ command, args });
+            proc.onExit(resolve);
+            proc.onError(reject);
+        });
+
+        expect(terminal.code).to.exist;
+    });
+
     it('test error on trying to execute a directory', async function (): Promise<void> {
         const error = await new Promise<ProcessErrorEvent>((resolve, reject) => {
             const proc = terminalProcessFactory({ command: __dirname });

package/src/node/terminal-process.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { isWindows } from '@theia/core';
+import { Disposable, DisposableCollection, Emitter, Event, isWindows } from '@theia/core';
 import { ILogger } from '@theia/core/lib/common';
 import { Process, ProcessType, ProcessOptions, /* ProcessErrorEvent */ } from './process';
 import { ProcessManager } from './process-manager';
@@ -54,6 +54,8 @@ export enum NodePtyErrors {
 export class TerminalProcess extends Process {
 
     protected readonly terminal: IPty | undefined;
+    private _delayedResizer: DelayedResizer | undefined;
+    private _exitCode: number | undefined;
 
     readonly outputStream = this.createOutputStream();
     readonly errorStream = new DevNullStream({ autoDestroy: true });
@@ -79,72 +81,114 @@ export class TerminalProcess extends Process {
         }
         this.logger.debug('Starting terminal process', JSON.stringify(options, undefined, 2));
 
-        try {
-            this.terminal = spawn(
-                options.command,
-                (isWindows && options.commandLine) || options.args || [],
-                options.options || {}
-            );
-
-            process.nextTick(() => this.emitOnStarted());
-
-            // node-pty actually wait for the underlying streams to be closed before emitting exit.
-            // We should emulate the `exit` and `close` sequence.
-            this.terminal.on('exit', (code, signal) => {
-                // Make sure to only pass either code or signal as !undefined, not
-                // both.
-                //
-                // node-pty quirk: On Linux/macOS, if the process exited through the
-                // exit syscall (with an exit code), signal will be 0 (an invalid
-                // signal value).  If it was terminated because of a signal, the
-                // signal parameter will hold the signal number and code should
-                // be ignored.
-                if (signal === undefined || signal === 0) {
-                    this.onTerminalExit(code, undefined);
-                } else {
-                    this.onTerminalExit(undefined, signame(signal));
+        // Delay resizes to avoid conpty not respecting very early resize calls
+        // see https://github.com/microsoft/vscode/blob/a1c783c/src/vs/platform/terminal/node/terminalProcess.ts#L177
+        if (isWindows) {
+            this._delayedResizer = new DelayedResizer();
+            this._delayedResizer.onTrigger(dimensions => {
+                this._delayedResizer?.dispose();
+                this._delayedResizer = undefined;
+                if (dimensions.cols && dimensions.rows) {
+                    this.resize(dimensions.cols, dimensions.rows);
                 }
-                process.nextTick(() => {
-                    if (signal === undefined || signal === 0) {
-                        this.emitOnClose(code, undefined);
-                    } else {
-                        this.emitOnClose(undefined, signame(signal));
-                    }
-                });
             });
+        }
 
-            this.terminal.on('data', (data: string) => {
-                ringBuffer.enq(data);
-            });
+        const startTerminal = (command: string): { terminal: IPty | undefined, inputStream: Writable } => {
+            try {
+                return this.createPseudoTerminal(command, options, ringBuffer);
+            } catch (error) {
+                // Normalize the error to make it as close as possible as what
+                // node's child_process.spawn would generate in the same
+                // situation.
+                const message: string = error.message;
 
-            this.inputStream = new Writable({
-                write: (chunk: string) => {
-                    this.write(chunk);
-                },
-            });
+                if (message.startsWith('File not found: ') || message.endsWith(NodePtyErrors.ENOENT)) {
+                    if (isWindows && command && !command.toLowerCase().endsWith('.exe')) {
+                        const commandExe = command + '.exe';
+                        this.logger.debug(`Trying terminal command '${commandExe}' because '${command}' was not found.`);
+                        return startTerminal(commandExe);
+                    }
 
-        } catch (error) {
-            this.inputStream = new DevNullStream({ autoDestroy: true });
+                    // Proceed with failure, reporting the original command because it was
+                    // the intended command and it was not found
+                    error.errno = 'ENOENT';
+                    error.code = 'ENOENT';
+                    error.path = options.command;
+                } else if (message.endsWith(NodePtyErrors.EACCES)) {
+                    // The shell program exists but was not accessible, so just fail
+                    error.errno = 'EACCES';
+                    error.code = 'EACCES';
+                    error.path = options.command;
+                }
+
+                // node-pty throws exceptions on Windows.
+                // Call the client error handler, but first give them a chance to register it.
+                this.emitOnErrorAsync(error);
 
-            // Normalize the error to make it as close as possible as what
-            // node's child_process.spawn would generate in the same
-            // situation.
-            const message: string = error.message;
-
-            if (message.startsWith('File not found: ') || message.endsWith(NodePtyErrors.ENOENT)) {
-                error.errno = 'ENOENT';
-                error.code = 'ENOENT';
-                error.path = options.command;
-            } else if (message.endsWith(NodePtyErrors.EACCES)) {
-                error.errno = 'EACCES';
-                error.code = 'EACCES';
-                error.path = options.command;
+                return { terminal: undefined, inputStream: new DevNullStream({ autoDestroy: true }) };
             }
+        };
 
-            // node-pty throws exceptions on Windows.
-            // Call the client error handler, but first give them a chance to register it.
-            this.emitOnErrorAsync(error);
-        }
+        const { terminal, inputStream } = startTerminal(options.command);
+        this.terminal = terminal;
+        this.inputStream = inputStream;
+    }
+
+    /**
+     * Helper for the constructor to attempt to create the pseudo-terminal encapsulating the shell process.
+     *
+     * @param command the shell command to launch
+     * @param options options for the shell process
+     * @param ringBuffer a ring buffer in which to collect terminal output
+     * @returns the terminal PTY and a stream by which it may be sent input
+     */
+    private createPseudoTerminal(command: string, options: TerminalProcessOptions, ringBuffer: MultiRingBuffer): { terminal: IPty | undefined, inputStream: Writable } {
+        const terminal = spawn(
+            command,
+            (isWindows && options.commandLine) || options.args || [],
+            options.options || {}
+        );
+
+        process.nextTick(() => this.emitOnStarted());
+
+        // node-pty actually wait for the underlying streams to be closed before emitting exit.
+        // We should emulate the `exit` and `close` sequence.
+        terminal.onExit(({ exitCode, signal }) => {
+            // Make sure to only pass either code or signal as !undefined, not
+            // both.
+            //
+            // node-pty quirk: On Linux/macOS, if the process exited through the
+            // exit syscall (with an exit code), signal will be 0 (an invalid
+            // signal value).  If it was terminated because of a signal, the
+            // signal parameter will hold the signal number and code should
+            // be ignored.
+            this._exitCode = exitCode;
+            if (signal === undefined || signal === 0) {
+                this.onTerminalExit(exitCode, undefined);
+            } else {
+                this.onTerminalExit(undefined, signame(signal));
+            }
+            process.nextTick(() => {
+                if (signal === undefined || signal === 0) {
+                    this.emitOnClose(exitCode, undefined);
+                } else {
+                    this.emitOnClose(undefined, signame(signal));
+                }
+            });
+        });
+
+        terminal.onData((data: string) => {
+            ringBuffer.enq(data);
+        });
+
+        const inputStream = new Writable({
+            write: (chunk: string) => {
+                this.write(chunk);
+            },
+        });
+
+        return { terminal, inputStream };
     }
 
     createOutputStream(): MultiRingBufferReadableStream {
@@ -180,8 +224,32 @@ export class TerminalProcess extends Process {
     }
 
     resize(cols: number, rows: number): void {
+        if (typeof cols !== 'number' || typeof rows !== 'number' || isNaN(cols) || isNaN(rows)) {
+            return;
+        }
         this.checkTerminal();
-        this.terminal!.resize(cols, rows);
+        try {
+            // Ensure that cols and rows are always >= 1, this prevents a native exception in winpty.
+            cols = Math.max(cols, 1);
+            rows = Math.max(rows, 1);
+
+            // Delay resize if needed
+            if (this._delayedResizer) {
+                this._delayedResizer.cols = cols;
+                this._delayedResizer.rows = rows;
+                return;
+            }
+
+            this.terminal!.resize(cols, rows);
+        } catch (error) {
+            // swallow error if the pty has already exited
+            // see also https://github.com/microsoft/vscode/blob/a1c783c/src/vs/platform/terminal/node/terminalProcess.ts#L549
+            if (this._exitCode !== undefined &&
+                error.message !== 'ioctl(2) failed, EBADF' &&
+                error.message !== 'Cannot resize a pty that has already exited') {
+                throw error;
+            }
+        }
     }
 
     write(data: string): void {
@@ -196,3 +264,27 @@ export class TerminalProcess extends Process {
     }
 
 }
+
+/**
+ * Tracks the latest resize event to be trigger at a later point.
+ */
+class DelayedResizer extends DisposableCollection {
+    rows: number | undefined;
+    cols: number | undefined;
+    private _timeout: NodeJS.Timeout;
+
+    private readonly _onTrigger = new Emitter<{ rows?: number; cols?: number }>();
+    get onTrigger(): Event<{ rows?: number; cols?: number }> { return this._onTrigger.event; }
+
+    constructor() {
+        super();
+        this.push(this._onTrigger);
+        this._timeout = setTimeout(() => this._onTrigger.fire({ rows: this.rows, cols: this.cols }), 1000);
+        this.push(Disposable.create(() => clearTimeout(this._timeout)));
+    }
+
+    override dispose(): void {
+        super.dispose();
+        clearTimeout(this._timeout);
+    }
+}