Gets provider resource URL asyncronously

sergeibbb · axosoft-ramint · commit 1b7921cc3fa1 · 2025-03-27T13:54:41.000-07:00
(#4142, #4143)
diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts
@@ -516,7 +516,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 			case 'gitea':
 			case 'gerrit':
 			case 'google-source':
-				url = remote.provider.url({ type: RemoteResourceType.Repo });
+				url = await remote.provider.url({ type: RemoteResourceType.Repo });
 				if (url == null) return ['private', remote];
 
 				break;
diff --git a/src/git/remotes/remoteProvider.ts b/src/git/remotes/remoteProvider.ts
@@ -100,7 +100,7 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 	abstract get name(): string;
 
 	async copy(resource: RemoteResource | RemoteResource[]): Promise<void> {
-		const urls = this.getUrlsFromResources(resource);
+		const urls = await this.getUrlsFromResources(resource);
 		if (!urls.length) return;
 
 		await env.clipboard.writeText(urls.join('\n'));
@@ -113,14 +113,14 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 	): Promise<{ uri: Uri; startLine?: number; endLine?: number } | undefined>;
 
 	async open(resource: RemoteResource | RemoteResource[]): Promise<boolean | undefined> {
-		const urls = this.getUrlsFromResources(resource);
+		const urls = await this.getUrlsFromResources(resource);
 		if (!urls.length) return false;
 
 		const results = await Promise.allSettled(urls.map(openUrl));
 		return results.every(r => getSettledValue(r) === true);
 	}
 
-	url(resource: RemoteResource): string | undefined {
+	url(resource: RemoteResource): Promise<string | undefined> | string | undefined {
 		switch (resource.type) {
 			case RemoteResourceType.Branch:
 				return this.getUrlForBranch(resource.branch);
@@ -186,7 +186,7 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 		base: { branch?: string; remote: { path: string; url: string } },
 		head: { branch: string; remote: { path: string; url: string } },
 		options?: { title?: string; description?: string },
-	): string | undefined;
+	): Promise<string | undefined> | string | undefined;
 
 	protected abstract getUrlForFile(fileName: string, branch?: string, sha?: string, range?: Range): string;
 
@@ -200,22 +200,19 @@ export abstract class RemoteProvider<T extends ResourceDescriptor = ResourceDesc
 		return encodeUrl(url)?.replace(/#/g, '%23');
 	}
 
-	private getUrlsFromResources(resource: RemoteResource | RemoteResource[]): string[] {
-		const urls: string[] = [];
+	private async getUrlsFromResources(resource: RemoteResource | RemoteResource[]): Promise<string[]> {
+		const urlPromises: (Promise<string | undefined> | string | undefined)[] = [];
 
 		if (Array.isArray(resource)) {
 			for (const r of resource) {
-				const url = this.url(r);
-				if (url == null) continue;
-
-				urls.push(url);
+				urlPromises.push(this.url(r));
 			}
 		} else {
-			const url = this.url(resource);
-			if (url != null) {
-				urls.push(url);
-			}
+			urlPromises.push(this.url(resource));
 		}
+		const urls: string[] = (await Promise.allSettled(urlPromises))
+			.map(r => getSettledValue(r))
+			.filter(r => r != null);
 		return urls;
 	}
 }
diff --git a/src/plus/repos/repositoryIdentityService.ts b/src/plus/repos/repositoryIdentityService.ts
@@ -179,7 +179,7 @@ export class RepositoryIdentityService implements Disposable {
 		const repoPath = repo.uri.fsPath;
 
 		for (const remote of remotes) {
-			const remoteUrl = remote.provider?.url({ type: RemoteResourceType.Repo });
+			const remoteUrl = await remote.provider?.url({ type: RemoteResourceType.Repo });
 			if (remoteUrl != null) {
 				await this.locator.storeLocation(repoPath, remoteUrl);
 			}
diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts
@@ -10,6 +10,7 @@ import type { OpenWorkspaceLocation } from '../../system/-webview/vscode';
 import { openWorkspace } from '../../system/-webview/vscode';
 import { log } from '../../system/decorators/log';
 import { normalizePath } from '../../system/path';
+import { getSettledValue } from '../../system/promise';
 import type { SubscriptionChangeEvent } from '../gk/subscriptionService';
 import { isSubscriptionStatePaidOrTrial } from '../gk/utils/subscription.utils';
 import type { CloudWorkspaceData, CloudWorkspaceRepositoryDescriptor } from './models/cloudWorkspace';
@@ -473,13 +474,12 @@ export class WorkspacesService implements Disposable {
 		const repoPath = repo.uri.fsPath;
 
 		const remotes = await repo.git.remotes().getRemotes();
-		const remoteUrls: string[] = [];
-		for (const remote of remotes) {
-			const remoteUrl = remote.provider?.url({ type: RemoteResourceType.Repo });
-			if (remoteUrl != null) {
-				remoteUrls.push(remoteUrl);
-			}
-		}
+		const remoteUrlPromises: Promise<string | undefined>[] = remotes.map(async remote => {
+			return remote.provider?.url({ type: RemoteResourceType.Repo });
+		});
+		const remoteUrls: string[] = (await Promise.allSettled(remoteUrlPromises))
+			.map(r => getSettledValue(r))
+			.filter(r => r != null);
 
 		for (const remoteUrl of remoteUrls) {
 			await this._repositoryLocator?.storeLocation(repoPath, remoteUrl);
@@ -906,7 +906,7 @@ export class WorkspacesService implements Disposable {
 			if (repo == null) continue;
 			const remote =
 				(await repo.git.remotes().getRemote('origin')) || (await repo.git.remotes().getRemotes())?.[0];
-			const remoteDescriptor = getRemoteDescriptor(remote);
+			const remoteDescriptor = await getRemoteDescriptor(remote);
 			if (remoteDescriptor == null) continue;
 			repoInputs.push({
 				owner: remoteDescriptor.owner,
@@ -1042,7 +1042,7 @@ export class WorkspacesService implements Disposable {
 			if (workspace instanceof CloudWorkspace) {
 				const remotes = await repo.git.remotes().getRemotes();
 				for (const remote of remotes) {
-					const remoteDescriptor = getRemoteDescriptor(remote);
+					const remoteDescriptor = await getRemoteDescriptor(remote);
 					if (remoteDescriptor == null) continue;
 					reposProviderMap.set(
 						`${remoteDescriptor.provider}/${remoteDescriptor.owner}/${remoteDescriptor.repoName}`,
@@ -1324,15 +1324,15 @@ export class WorkspacesService implements Disposable {
 	}
 }
 
-function getRemoteDescriptor(remote: GitRemote): RemoteDescriptor | undefined {
+async function getRemoteDescriptor(remote: GitRemote): Promise<RemoteDescriptor | undefined> {
 	if (remote.provider?.owner == null) return undefined;
 	const remoteRepoName = remote.provider.path.split('/').pop();
 	if (remoteRepoName == null) return undefined;
 	return {
 		provider: remote.provider.id.toLowerCase(),
 		owner: remote.provider.owner.toLowerCase(),
 		repoName: remoteRepoName.toLowerCase(),
-		url: remote.provider.url({ type: RemoteResourceType.Repo }),
+		url: await remote.provider.url({ type: RemoteResourceType.Repo }),
 	};
 }
 
diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts
@@ -863,7 +863,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 				? {
 						name: remote.provider.name,
 						icon: remote.provider.icon === 'remote' ? 'cloud' : remote.provider.icon,
-						url: remote.provider.url({ type: RemoteResourceType.Repo }),
+						url: await remote.provider.url({ type: RemoteResourceType.Repo }),
 				  }
 				: undefined,
 		};
diff --git a/src/webviews/plus/graph/graphWebview.ts b/src/webviews/plus/graph/graphWebview.ts
@@ -2567,7 +2567,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 					branchState.provider = {
 						name: remote.provider.name,
 						icon: remote.provider.icon === 'remote' ? 'cloud' : remote.provider.icon,
-						url: remote.provider.url({ type: RemoteResourceType.Repo }),
+						url: await remote.provider.url({ type: RemoteResourceType.Repo }),
 					};
 				}
 
diff --git a/src/webviews/plus/graph/graphWebviewUtils.ts b/src/webviews/plus/graph/graphWebviewUtils.ts
@@ -48,7 +48,7 @@ export async function formatRepositories(repositories: Repository[]): Promise<Gr
 								  }
 								: undefined,
 							icon: remote.provider.icon === 'remote' ? 'cloud' : remote.provider.icon,
-							url: remote.provider.url({ type: RemoteResourceType.Repo }),
+							url: await remote.provider.url({ type: RemoteResourceType.Repo }),
 					  }
 					: undefined,
 				isVirtual: repo.provider.virtual,

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ export class RepositoryIdentityService implements Disposable {`
`179`	`179`	`const repoPath = repo.uri.fsPath;`
`180`	`180`
`181`	`181`	`for (const remote of remotes) {`
`182`		`- const remoteUrl = remote.provider?.url({ type: RemoteResourceType.Repo });`
	`182`	`+ const remoteUrl = await remote.provider?.url({ type: RemoteResourceType.Repo });`
`183`	`183`	`if (remoteUrl != null) {`
`184`	`184`	`await this.locator.storeLocation(repoPath, remoteUrl);`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe`
`863`	`863`	`? {`
`864`	`864`	`name: remote.provider.name,`
`865`	`865`	`icon: remote.provider.icon === 'remote' ? 'cloud' : remote.provider.icon,`
`866`		`- url: remote.provider.url({ type: RemoteResourceType.Repo }),`
	`866`	`+ url: await remote.provider.url({ type: RemoteResourceType.Repo }),`
`867`	`867`	`}`
`868`	`868`	`: undefined,`
`869`	`869`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2567,7 +2567,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph`
`2567`	`2567`	`branchState.provider = {`
`2568`	`2568`	`name: remote.provider.name,`
`2569`	`2569`	`icon: remote.provider.icon === 'remote' ? 'cloud' : remote.provider.icon,`
`2570`		`- url: remote.provider.url({ type: RemoteResourceType.Repo }),`
	`2570`	`+ url: await remote.provider.url({ type: RemoteResourceType.Repo }),`
`2571`	`2571`	`};`
`2572`	`2572`	`}`
`2573`	`2573`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export async function formatRepositories(repositories: Repository[]): Promise<Gr`
`48`	`48`	`}`
`49`	`49`	`: undefined,`
`50`	`50`	`icon: remote.provider.icon === 'remote' ? 'cloud' : remote.provider.icon,`
`51`		`- url: remote.provider.url({ type: RemoteResourceType.Repo }),`
	`51`	`+ url: await remote.provider.url({ type: RemoteResourceType.Repo }),`
`52`	`52`	`}`
`53`	`53`	`: undefined,`
`54`	`54`	`isVirtual: repo.provider.virtual,`