@gitkraken/core-gitlens 0.10.0 → 0.10.2

package/dist/plus/integrations/models/gitHostIntegration.js

@@ -17,7 +17,7 @@ import { mergeCollectionMetadata, throwIfAllSettledFailed } from "../providers/u
 import { areDomainsOnSameHost } from "../utils/domain.utils.js";
 import { getSelfManagedBaseUrl, isGitSelfManagedHostIntegrationId } from "../utils/integration.utils.js";
 import { toIssueShape, toProviderIssueStates, toProviderPullRequestStates } from "../providers/models.js";
-import { IntegrationBase } from "./integration.js";
+import { IntegrationBase, isReadSessionFailure } from "./integration.js";
 //#region ../plus/integrations/src/models/gitHostIntegration.ts
 /**
 * Whether an SDK read for `providerId` must send the session's secret as an HTTP Basic credential.
@@ -76,8 +76,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getAccountForEmail(repo, email, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		try {
 			const author = await this.getProviderAccountForEmail(this._session, repo, email, options);
 			this.resetRequestExceptionCount("getAccountForEmail");
@@ -94,8 +93,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	*/
 	async getSshSigningKeysForEmails(repo, emails) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return /* @__PURE__ */ new Map();
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return /* @__PURE__ */ new Map();
 		try {
 			const keys = await this.getProviderSshSigningKeysForEmails(this._session, repo, emails);
 			this.resetRequestExceptionCount("getSshSigningKeysForEmails");
@@ -111,8 +109,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getAccountForCommit(repo, rev, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		try {
 			const author = await this.getProviderAccountForCommit(this._session, repo, rev, options);
 			this.resetRequestExceptionCount("getAccountForCommit");
@@ -124,8 +121,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getDefaultBranch(repo, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		return this.ctx.cache.getRepositoryDefaultBranch(repo, this, () => ({ value: (async () => {
 			try {
 				const result = await this.getProviderDefaultBranch(this._session, repo, options?.cancellation);
@@ -144,7 +140,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	* its own error, which the caller reports for the connection instead of the repository's refusal.
 	*/
 	async settleRepositoryRefusal(repo, refusal) {
-		const session = await this.resolveReadSession(repo.connectionId, void 0);
+		const session = await this.resolveReadSessionOrThrow(repo.connectionId, void 0);
 		if (session == null) return void 0;
 		const [slot] = await this.settleBatchRefusals(session, [{
 			owner: repo.owner,
@@ -158,8 +154,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getRepositoryMetadata(repo, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return void 0;
 		return this.ctx.cache.getRepositoryMetadata(repo, this, () => ({ value: (async () => {
 			try {
 				const result = await this.getProviderRepositoryMetadata(this._session, repo, options?.cancellation);
@@ -235,7 +230,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getOrganizationsForUserResult(connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const result = await this.getProviderOrganizationsForUser?.(session);
@@ -271,7 +266,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getProjectsForOrgResult(org, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		if (this.getProviderProjectsForOrg == null) return;
 		const start = performance.now();
 		try {
@@ -307,7 +302,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getRepositoriesForOrgResult(org, options) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(options?.connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const result = await this.getProviderRepositoriesForOrg?.(session, org, options);
@@ -338,7 +333,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getRepositoriesForUserResult(options) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(options?.connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		if (this.getProviderRepositoriesForUser == null) return;
 		const start = performance.now();
 		try {
@@ -362,8 +357,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async mergePullRequest(pr, options, cancellation) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return false;
-		await this.refreshSessionIfExpired(scope);
+		if (await this.prepareSessionLookup() != null) return false;
 		try {
 			const result = await this.mergeProviderPullRequest(this._session, pr, options, cancellation);
 			this.resetRequestExceptionCount("mergePullRequest");
@@ -378,9 +372,13 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getPullRequestForBranch(repo, branch, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		const refreshFailure = await this.prepareSessionLookup();
+		if (refreshFailure === "unconnected") return void 0;
 		const { expiryOverride, throwOnError, ...opts } = options ?? {};
+		if (refreshFailure != null) {
+			if (throwOnError) throw refreshFailure;
+			return;
+		}
 		return this.ctx.cache.getPullRequestForBranch(branch, repo, this, (cacheable) => ({ value: (async () => {
 			try {
 				const result = await this.getProviderPullRequestForBranch(this._session, repo, branch, opts);
@@ -396,9 +394,13 @@ var GitHostIntegration = class extends IntegrationBase {
 	}
 	async getPullRequestForCommit(repo, rev, options) {
 		const scope = getScopedLogger();
-		if (!(this.maybeConnected ?? await this.isConnected())) return void 0;
-		await this.refreshSessionIfExpired(scope);
+		const refreshFailure = await this.prepareSessionLookup();
+		if (refreshFailure === "unconnected") return void 0;
 		const { throwOnError, ...cacheOptions } = options ?? {};
+		if (refreshFailure != null) {
+			if (throwOnError) throw refreshFailure;
+			return;
+		}
 		return this.ctx.cache.getPullRequestForSha(rev, repo, this, (cacheable) => ({ value: (async () => {
 			try {
 				const result = await this.getProviderPullRequestForCommit(this._session, repo, rev);
@@ -467,7 +469,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const providerId = this.authProvider.id;
 		const states = toProviderIssueStates(options?.state);
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		let customUrl;
 		let api;
@@ -795,7 +797,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const providerId = this.authProvider.id;
 		const states = toProviderPullRequestStates(options?.state);
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		let customUrl;
 		let api;
@@ -1002,7 +1004,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const scope = getScopedLogger();
 		const { connectionId, ...searchOptions } = options ?? {};
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const prs = await this.searchProviderMyPullRequests(session, ensureArray(repos), cancellation, searchOptions);
@@ -1034,7 +1036,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getMyPullRequestsForUserResult(options, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		if (this.getProviderMyPullRequestsForUser == null) return;
 		const start = performance.now();
 		try {
@@ -1092,7 +1094,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async searchPullRequestsPageResult(options, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const result = await this.searchProviderPullRequestsPage?.(session, options, cancellation);
@@ -1118,7 +1120,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const scope = getScopedLogger();
 		const { connectionId, ...searchOptions } = options ?? {};
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return void 0;
 		try {
 			const prs = await this.searchProviderPullRequests?.(session, searchQuery, ensureArray(repos), cancellation, searchOptions);
 			this.resetRequestExceptionCount("searchPullRequests");
@@ -1144,7 +1146,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async searchIssuesPageResult(options, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const result = await this.searchProviderIssuesPage?.(session, options, cancellation);
@@ -1175,7 +1177,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async countIssuesResult(scopes, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const counts = await this.countProviderIssues?.(session, scopes, cancellation);
@@ -1222,7 +1224,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getIssuesBatchResult(coordinates, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		let slots;
 		try {
@@ -1273,7 +1275,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getPullRequestsBatchResult(coordinates, options, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		let slots;
 		try {
@@ -1321,7 +1323,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getIssuesEtagFieldsResult(coordinates, options, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const slots = await this.getProviderIssuesEtagFields?.(session, coordinates, options, cancellation);
@@ -1357,7 +1359,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getPullRequestsEtagFieldsResult(coordinates, options, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const slots = await this.getProviderPullRequestsEtagFields?.(session, coordinates, options, cancellation);
@@ -1400,7 +1402,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async getPullRequestsForBranchesResult(targets, options, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		let slots;
 		try {
@@ -1440,7 +1442,7 @@ var GitHostIntegration = class extends IntegrationBase {
 	async countPullRequestsResult(scopes, cancellation, connectionId) {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
-		if (session == null) return void 0;
+		if (session == null || isReadSessionFailure(session)) return session && { error: session.error };
 		const start = performance.now();
 		try {
 			const counts = await this.countProviderPullRequests?.(session, scopes, cancellation);