Skip to content

Drop jsonrpc connection after all messages are handled #23391

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { CancellationToken, Disposable, Event, EventEmitter } from 'vscode';
import * as ch from 'child_process';
import * as path from 'path';
import * as rpc from 'vscode-jsonrpc/node';
import { PassThrough } from 'stream';
import { isWindows } from '../../../../common/platform/platformService';
import { EXTENSION_ROOT_DIR } from '../../../../constants';
import { traceError, traceInfo, traceLog, traceVerbose, traceWarn } from '../../../../logging';
Expand Down Expand Up @@ -56,24 +57,43 @@ class NativeGlobalPythonFinderImpl implements NativeGlobalPythonFinder {

public startSearch(token?: CancellationToken): Promise<void> {
const deferred = createDeferred<void>();
const proc = ch.spawn(NATIVE_LOCATOR, [], { stdio: 'pipe' });
const proc = ch.spawn(NATIVE_LOCATOR, [], { env: process.env });
const disposables: Disposable[] = [];

// jsonrpc package cannot handle messages coming through too quicly.
// Lets handle the messages and close the stream only when
// we have got the exit event.
const readable = new PassThrough();
proc.stdout.pipe(readable, { end: false });
const writable = new PassThrough();
writable.pipe(proc.stdin, { end: false });
const disposeStreams = new Disposable(() => {
readable.end();
readable.destroy();
writable.end();
writable.destroy();
});
const connection = rpc.createMessageConnection(
new rpc.StreamMessageReader(proc.stdout),
new rpc.StreamMessageWriter(proc.stdin),
new rpc.StreamMessageReader(readable),
new rpc.StreamMessageWriter(writable),
);

disposables.push(
connection,
disposeStreams,
connection.onError((ex) => {
disposeStreams.dispose();
traceError('Error in Native Python Finder', ex);
}),
connection.onNotification('pythonEnvironment', (data: NativeEnvInfo) => {
this._onDidFindPythonEnvironment.fire(data);
}),
connection.onNotification('envManager', (data: NativeEnvManagerInfo) => {
this._onDidFindEnvironmentManager.fire(data);
}),
connection.onNotification('exit', () => {
traceVerbose('Native Python Finder exited');
traceInfo('Native Python Finder exited');
disposeStreams.dispose();
}),
connection.onNotification('log', (data: NativeLog) => {
switch (data.level) {
Expand Down
Loading