Add a message that would reduce the grace time

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

@@ -150,6 +150,10 @@ export const enum ProtocolConstants {
 	 * If there is no reconnection within this time-frame, consider the connection permanently closed...
 	 */
 	ReconnectionGraceTime = 3 * 60 * 60 * 1000, // 3hrs
+	/**
+	 * Maximal grace time between the first and the last reconnection...
+	 */
+	ReconnectionShortGraceTime = 5 * 60 * 1000, // 5min
 }
 
 class ProtocolMessage {

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

@@ -15,6 +15,10 @@ export interface IExtHostSocketMessage {
 	skipWebSocketFrames: boolean;
 }
 
+export interface IExtHostReduceGraceTimeMessage {
+	type: 'VSCODE_EXTHOST_IPC_REDUCE_GRACE_TIME';
+}
+
 export const enum MessageType {
 	Initialized,
 	Ready,
@@ -44,4 +48,4 @@ export function isMessageOfType(message: VSBuffer, type: MessageType): boolean {
 		case 3: return type === MessageType.Terminate;
 		default: return false;
 	}
-}
\ No newline at end of file
+}

src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts

@@ -13,7 +13,7 @@ import { PersistentProtocol, ProtocolConstants, BufferedEmitter } from 'vs/base/
 import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
 import product from 'vs/platform/product/common/product';
 import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
-import { MessageType, createMessageOfType, isMessageOfType, IExtHostSocketMessage, IExtHostReadyMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
+import { MessageType, createMessageOfType, isMessageOfType, IExtHostSocketMessage, IExtHostReadyMessage, IExtHostReduceGraceTimeMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
 import { ExtensionHostMain, IExitFn } from 'vs/workbench/services/extensions/common/extensionHostMain';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IURITransformer, URITransformer, IRawURITransformer } from 'vs/base/common/uriIpc';
@@ -21,6 +21,7 @@ import { exists } from 'vs/base/node/pfs';
 import { realpath } from 'vs/base/node/extpath';
 import { IHostUtils } from 'vs/workbench/api/common/extHostExtensionService';
 import 'vs/workbench/api/node/extHost.services';
+import { RunOnceScheduler } from 'vs/base/common/async';
 
 interface ParsedExtHostArgs {
 	uriTransformerPath?: string;
@@ -91,9 +92,12 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 				reject(new Error('VSCODE_EXTHOST_IPC_SOCKET timeout'));
 			}, 60000);
 
-			let disconnectWaitTimer: NodeJS.Timeout | null = null;
+			const reconnectionGraceTime = ProtocolConstants.ReconnectionGraceTime;
+			const reconnectionShortGraceTime = ProtocolConstants.ReconnectionShortGraceTime;
+			const disconnectRunner1 = new RunOnceScheduler(() => onTerminate(), reconnectionGraceTime);
+			const disconnectRunner2 = new RunOnceScheduler(() => onTerminate(), reconnectionShortGraceTime);
 
-			process.on('message', (msg: IExtHostSocketMessage, handle: net.Socket) => {
+			process.on('message', (msg: IExtHostSocketMessage | IExtHostReduceGraceTimeMessage, handle: net.Socket) => {
 				if (msg && msg.type === 'VSCODE_EXTHOST_IPC_SOCKET') {
 					const initialDataChunk = VSBuffer.wrap(Buffer.from(msg.initialDataChunk, 'base64'));
 					let socket: NodeSocket | WebSocketNodeSocket;
@@ -104,10 +108,8 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 					}
 					if (protocol) {
 						// reconnection case
-						if (disconnectWaitTimer) {
-							clearTimeout(disconnectWaitTimer);
-							disconnectWaitTimer = null;
-						}
+						disconnectRunner1.cancel();
+						disconnectRunner2.cancel();
 						protocol.beginAcceptReconnection(socket, initialDataChunk);
 						protocol.endAcceptReconnection();
 					} else {
@@ -116,21 +118,21 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 						protocol.onClose(() => onTerminate());
 						resolve(protocol);
 
-						if (msg.skipWebSocketFrames) {
-							// Wait for rich client to reconnect
-							protocol.onSocketClose(() => {
-								// The socket has closed, let's give the renderer a certain amount of time to reconnect
-								disconnectWaitTimer = setTimeout(() => {
-									disconnectWaitTimer = null;
-									onTerminate();
-								}, ProtocolConstants.ReconnectionGraceTime);
-							});
-						} else {
-							// Do not wait for web companion to reconnect
-							protocol.onSocketClose(() => {
-								onTerminate();
-							});
-						}
+						// Wait for rich client to reconnect
+						protocol.onSocketClose(() => {
+							// The socket has closed, let's give the renderer a certain amount of time to reconnect
+							disconnectRunner1.schedule();
+						});
+					}
+				}
+				if (msg && msg.type === 'VSCODE_EXTHOST_IPC_REDUCE_GRACE_TIME') {
+					if (disconnectRunner2.isScheduled()) {
+						// we are disconnected and already running the short reconnection timer
+						return;
+					}
+					if (disconnectRunner1.isScheduled()) {
+						// we are disconnected and running the long reconnection timer
+						disconnectRunner2.schedule();
 					}
 				}
 			});