Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: only show "Looking for remote tunnel" on startup if user has used tunnel before #200264

Merged
merged 1 commit into from
Dec 7, 2023
Merged

fix: only show "Looking for remote tunnel" on startup if user has used tunnel before #200264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 41 additions & 29 deletions src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const REMOTE_TUNNEL_CONNECTION_STATE = new RawContextKey<CONTEXT_KEY_STAT
const REMOTE_TUNNEL_USED_STORAGE_KEY = 'remoteTunnelServiceUsed';
const REMOTE_TUNNEL_PROMPTED_PREVIEW_STORAGE_KEY = 'remoteTunnelServicePromptedPreview';
const REMOTE_TUNNEL_EXTENSION_RECOMMENDED_KEY = 'remoteTunnelExtensionRecommended';
const REMOTE_TUNNEL_HAS_USED_BEFORE = 'remoteTunnelHasUsed';
const REMOTE_TUNNEL_EXTENSION_TIMEOUT = 4 * 60 * 1000; // show the recommendation that a machine started using tunnels if it joined less than 4 minutes ago

const INVALID_TOKEN_RETRIES = 2;
Expand Down Expand Up @@ -236,38 +237,47 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
return; // already initialized, token available
}

return await this.progressService.withProgress(
{
location: ProgressLocation.Window,
title: localize({ key: 'initialize.progress.title', comment: ['Only translate \'Looking for remote tunnel\', do not change the format of the rest (markdown link format)'] }, "[Looking for remote tunnel](command:{0})", RemoteTunnelCommandIds.showLog),
},
async (progress: IProgress<IProgressStep>) => {
const listener = this.remoteTunnelService.onDidChangeTunnelStatus(status => {
switch (status.type) {
case 'connecting':
if (status.progress) {
progress.report({ message: status.progress });
}
break;
}
});
let newSession: IRemoteTunnelSession | undefined;
if (mode.active) {
const token = await this.getSessionToken(mode.session);
if (token) {
newSession = { ...mode.session, token };
}
const doInitialStateDiscovery = async (progress?: IProgress<IProgressStep>) => {
const listener = progress && this.remoteTunnelService.onDidChangeTunnelStatus(status => {
switch (status.type) {
case 'connecting':
if (status.progress) {
progress.report({ message: status.progress });
}
break;
}
const status = await this.remoteTunnelService.initialize(mode.active && newSession ? { ...mode, session: newSession } : INACTIVE_TUNNEL_MODE);
listener.dispose();

if (status.type === 'connected') {
this.connectionInfo = status.info;
this.connectionStateContext.set('connected');
return;
});
let newSession: IRemoteTunnelSession | undefined;
if (mode.active) {
const token = await this.getSessionToken(mode.session);
if (token) {
newSession = { ...mode.session, token };
}
}
);
const status = await this.remoteTunnelService.initialize(mode.active && newSession ? { ...mode, session: newSession } : INACTIVE_TUNNEL_MODE);
listener?.dispose();

if (status.type === 'connected') {
this.connectionInfo = status.info;
this.connectionStateContext.set('connected');
return;
}
};


const hasUsed = this.storageService.getBoolean(REMOTE_TUNNEL_HAS_USED_BEFORE, StorageScope.APPLICATION, false);

if (hasUsed) {
await this.progressService.withProgress(
{
location: ProgressLocation.Window,
title: localize({ key: 'initialize.progress.title', comment: ['Only translate \'Looking for remote tunnel\', do not change the format of the rest (markdown link format)'] }, "[Looking for remote tunnel](command:{0})", RemoteTunnelCommandIds.showLog),
},
doInitialStateDiscovery
);
} else {
doInitialStateDiscovery(undefined);
}
}

private getPreferredTokenFromSession(session: ExistingSessionItem) {
Expand All @@ -279,6 +289,8 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
return this.connectionInfo;
}

this.storageService.store(REMOTE_TUNNEL_HAS_USED_BEFORE, true, StorageScope.APPLICATION, StorageTarget.MACHINE);

let tokenProblems = false;
for (let i = 0; i < INVALID_TOKEN_RETRIES; i++) {
tokenProblems = false;
Expand Down