fix: unnecessary cancellation messages in ipc

* performance optimization

* Ensure that requests made by the client are canceled when the client is disposed.

* remove the combinedDisposable function

* remove the combinedDisposable function

Co-authored-by: Connor Peet <[email protected]>

---------

Co-authored-by: Connor Peet <[email protected]>

Author: connor4312

src/vs/base/parts/ipc/common/ipc.ts

@@ -10,7 +10,8 @@ import { CancellationToken, CancellationTokenSource } from '../../../common/canc
 import { memoize } from '../../../common/decorators.js';
 import { CancellationError, ErrorNoTelemetry } from '../../../common/errors.js';
 import { Emitter, Event, EventMultiplexer, Relay } from '../../../common/event.js';
-import { combinedDisposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
+import { createSingleCallFunction } from '../../../common/functional.js';
+import { DisposableStore, dispose, IDisposable, toDisposable } from '../../../common/lifecycle.js';
 import { revive } from '../../../common/marshalling.js';
 import * as strings from '../../../common/strings.js';
 import { isFunction, isUndefinedOrNull } from '../../../common/types.js';
@@ -580,6 +581,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 		}
 
 		let disposable: IDisposable;
+		let disposableWithRequestCancel: IDisposable;
 
 		const result = new Promise((c, e) => {
 			if (cancellationToken.isCancellationRequested) {
@@ -635,14 +637,20 @@ export class ChannelClient implements IChannelClient, IDisposable {
 				e(new CancellationError());
 			};
 
-			const cancellationTokenListener = cancellationToken.onCancellationRequested(cancel);
-			disposable = combinedDisposable(toDisposable(cancel), cancellationTokenListener);
-			this.activeRequests.add(disposable);
+			disposable = cancellationToken.onCancellationRequested(cancel);
+			disposableWithRequestCancel = {
+				dispose: createSingleCallFunction(() => {
+					cancel();
+					disposable.dispose();
+				})
+			};
+
+			this.activeRequests.add(disposableWithRequestCancel);
 		});
 
 		return result.finally(() => {
 			disposable.dispose();
-			this.activeRequests.delete(disposable);
+			this.activeRequests.delete(disposableWithRequestCancel);
 		});
 	}
 
@@ -655,12 +663,19 @@ export class ChannelClient implements IChannelClient, IDisposable {
 
 		const emitter = new Emitter<any>({
 			onWillAddFirstListener: () => {
-				uninitializedPromise = createCancelablePromise(_ => this.whenInitialized());
-				uninitializedPromise.then(() => {
-					uninitializedPromise = null;
+				const doRequest = () => {
 					this.activeRequests.add(emitter);
 					this.sendRequest(request);
-				});
+				};
+				if (this.state === State.Idle) {
+					doRequest();
+				} else {
+					uninitializedPromise = createCancelablePromise(_ => this.whenInitialized());
+					uninitializedPromise.then(() => {
+						uninitializedPromise = null;
+						doRequest();
+					});
+				}
 			},
 			onDidRemoveLastListener: () => {
 				if (uninitializedPromise) {
@@ -933,6 +948,7 @@ export class IPCServer<TContext = string> implements IChannelServer<TContext>, I
 				disposables = undefined;
 			}
 		});
+		that.disposables.add(emitter);
 
 		return emitter.event;
 	}

src/vs/workbench/services/extensions/common/rpcProtocol.ts

@@ -483,7 +483,7 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
 			disposable.add(cancellationToken.onCancellationRequested(() => {
 				const msg = MessageIO.serializeCancel(req);
 				this._logger?.logOutgoing(msg.byteLength, req, RequestInitiator.LocalSide, `cancel`);
-				this._protocol.send(MessageIO.serializeCancel(req));
+				this._protocol.send(msg);
 			}));
 		}