From e5067ba2a98cf19f567bafb5356cb7b5f78cf240 Mon Sep 17 00:00:00 2001 From: "Machado, Meygha" Date: Tue, 17 Nov 2020 16:37:43 -0600 Subject: [PATCH] separate event domain from UI --- ci/dev/vscode.patch | 63 +++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index c8854c8b..c2e58d33 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -746,12 +746,12 @@ index fdd5890c69f72025b94913380f0d226226e8c8fb..e084236526b38c1144d47b8b3000b367 (err: any, socket: ISocket | undefined) => { if (err || !socket) { options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`); -@@ -331,12 +331,17 @@ export const enum PersistentConnectionEventType { +@@ -331,12 +331,16 @@ export const enum PersistentConnectionEventType { } export class ConnectionLostEvent { public readonly type = PersistentConnectionEventType.ConnectionLost; + constructor( -+ public readonly suppressPopup?: boolean ++ public readonly connectionAttempt?: number + ) { } } export class ReconnectionWaitEvent { @@ -760,67 +760,68 @@ index fdd5890c69f72025b94913380f0d226226e8c8fb..e084236526b38c1144d47b8b3000b367 public readonly durationSeconds: number, - private readonly cancellableTimer: CancelablePromise + private readonly cancellableTimer: CancelablePromise, -+ public readonly suppressPopup?: boolean, -+ public readonly forceDialog?: boolean ++ public readonly connectionAttempt?: number, ) { } public skipWait(): void { -@@ -345,12 +350,21 @@ export class ReconnectionWaitEvent { +@@ -345,12 +349,21 @@ export class ReconnectionWaitEvent { } export class ReconnectionRunningEvent { public readonly type = PersistentConnectionEventType.ReconnectionRunning; + constructor( -+ public readonly suppressPopup?: boolean ++ public readonly connectionAttempt?: number + ) { } } export class ConnectionGainEvent { public readonly type = PersistentConnectionEventType.ConnectionGain; + constructor( -+ public readonly suppressPopup?: boolean ++ public readonly connectionAttempt?: number + ) { } } export class ReconnectionPermanentFailureEvent { public readonly type = PersistentConnectionEventType.ReconnectionPermanentFailure; + constructor( -+ public readonly suppressPopup?: boolean | undefined ++ public readonly connectionAttempt?: number + ) { } } export type PersistenConnectionEvent = ConnectionGainEvent | ConnectionLostEvent | ReconnectionWaitEvent | ReconnectionRunningEvent | ReconnectionPermanentFailureEvent; -@@ -411,16 +425,22 @@ abstract class PersistentConnection extends Disposable { +@@ -411,8 +424,9 @@ abstract class PersistentConnection extends Disposable { } const logPrefix = commonLogPrefix(this._connectionType, this.reconnectionToken, true); this._options.logService.info(`${logPrefix} starting reconnecting loop. You can get more information with the trace log level.`); - this._onDidStateChange.fire(new ConnectionLostEvent()); -+ let suppressPopup = true; -+ let forceDialog = false; -+ this._onDidStateChange.fire(new ConnectionLostEvent(suppressPopup)); ++ this._onDidStateChange.fire(new ConnectionLostEvent(0)); const TIMES = [5, 5, 10, 10, 10, 10, 10, 30]; -+ const SHOW_POPUP_ON_ATTEMPT = 2 // aka third attempt + const disconnectStartTime = Date.now(); let attempt = -1; do { - attempt++; -+ suppressPopup = (attempt < SHOW_POPUP_ON_ATTEMPT) ? true : false -+ forceDialog = (attempt == SHOW_POPUP_ON_ATTEMPT) +@@ -420,7 +434,7 @@ abstract class PersistentConnection extends Disposable { const waitTime = (attempt < TIMES.length ? TIMES[attempt] : TIMES[TIMES.length - 1]); try { const sleepPromise = sleep(waitTime); - this._onDidStateChange.fire(new ReconnectionWaitEvent(waitTime, sleepPromise)); -+ this._onDidStateChange.fire(new ReconnectionWaitEvent(waitTime, sleepPromise, suppressPopup, forceDialog)); ++ this._onDidStateChange.fire(new ReconnectionWaitEvent(waitTime, sleepPromise, attempt)); this._options.logService.info(`${logPrefix} waiting for ${waitTime} seconds before reconnecting...`); try { -@@ -433,7 +453,7 @@ abstract class PersistentConnection extends Disposable { +@@ -433,13 +447,13 @@ abstract class PersistentConnection extends Disposable { } // connection was lost, let's try to re-establish it - this._onDidStateChange.fire(new ReconnectionRunningEvent()); -+ this._onDidStateChange.fire(new ReconnectionRunningEvent(suppressPopup)); ++ this._onDidStateChange.fire(new ReconnectionRunningEvent(attempt)); this._options.logService.info(`${logPrefix} resolving connection...`); const simpleOptions = await resolveConnectionOptions(this._options, this.reconnectionToken, this.protocol); this._options.logService.info(`${logPrefix} connecting to ${simpleOptions.host}:${simpleOptions.port}...`); + await connectWithTimeLimit(simpleOptions.logService, this._reconnect(simpleOptions), RECONNECT_TIMEOUT); + this._options.logService.info(`${logPrefix} reconnected!`); +- this._onDidStateChange.fire(new ConnectionGainEvent()); ++ this._onDidStateChange.fire(new ConnectionGainEvent(attempt)); + + break; + } catch (err) { diff --git a/src/vs/platform/storage/browser/storageService.ts b/src/vs/platform/storage/browser/storageService.ts index ab3fd347b69f8a3d9b96e706cd87c911b8ffed6b..9d351037b577f9f1edfd18ae9b3c48a211f4467f 100644 --- a/src/vs/platform/storage/browser/storageService.ts @@ -3951,16 +3952,28 @@ index 94e7e7a4bac154c45078a1b5034e50634a7a43af..8164200dcef1efbc65b50eef9c270af3 this._dirnameKey.set(value ? dirname(value).fsPath : null); this._pathKey.set(value ? value.fsPath : null); diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts -index 98573a206f14928fc3fdf18fe927cb75034e4ad1..a031f76924abf8f10c510ea9c043f670c5b43074 100644 +index 98573a206f14928fc3fdf18fe927cb75034e4ad1..1430666aa94f941bda086df503fec8b35aa2b25f 100644 --- a/src/vs/workbench/contrib/remote/browser/remote.ts +++ b/src/vs/workbench/contrib/remote/browser/remote.ts -@@ -795,31 +795,43 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution { +@@ -730,6 +730,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution { + @IContextKeyService contextKeyService: IContextKeyService + ) { + const connection = remoteAgentService.getConnection(); ++ const SHOW_POPUP_ON_ATTEMPT = 2 // aka third attempt + if (connection) { + let visibleProgress: VisibleProgress | null = null; + let lastLocation: ProgressLocation.Dialog | ProgressLocation.Notification | null = null; +@@ -793,33 +794,47 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution { + disposableListener.dispose(); + disposableListener = null; } ++ let suppressPopup = (typeof e.connectionAttempt == 'number' && e.connectionAttempt < SHOW_POPUP_ON_ATTEMPT) ++ let forceDialog = (typeof e.connectionAttempt == 'number' && e.connectionAttempt == SHOW_POPUP_ON_ATTEMPT) switch (e.type) { case PersistentConnectionEventType.ConnectionLost: - if (!visibleProgress) { - visibleProgress = showProgress(ProgressLocation.Dialog, [reconnectButton, reloadButton]); -+ if (e.suppressPopup) { ++ if (suppressPopup) { + hideProgress() + } else { + if (!visibleProgress) { @@ -3974,10 +3987,10 @@ index 98573a206f14928fc3fdf18fe927cb75034e4ad1..a031f76924abf8f10c510ea9c043f670 reconnectWaitEvent = e; - visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reconnectButton, reloadButton]); - visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds); -+ if (e.suppressPopup) { ++ if (suppressPopup) { + hideProgress() + } else { -+ const location = e.forceDialog ? ProgressLocation.Dialog : (lastLocation || ProgressLocation.Notification) ++ const location = forceDialog ? ProgressLocation.Dialog : (lastLocation || ProgressLocation.Notification) + visibleProgress = showProgress(location, [reconnectButton, reloadButton]); + visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds); + } @@ -3993,7 +4006,7 @@ index 98573a206f14928fc3fdf18fe927cb75034e4ad1..a031f76924abf8f10c510ea9c043f670 - // Need to move from dialog if being shown and user needs to type in a prompt - if (lastLocation === ProgressLocation.Dialog && visibleProgress !== null) { - visibleProgress = showProgress(ProgressLocation.Notification, [reloadButton], visibleProgress.lastReport); -+ if (e.suppressPopup) { ++ if (suppressPopup) { + hideProgress() + } else { + visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reloadButton]);