@gitkraken/core-gitlens 0.24.0 → 0.26.0

package/dist/plus/git-github/api/github.js

@@ -1869,6 +1869,15 @@ var GitHubApi = class {
 				} : data;
 			} catch (ex) {
 				if (ex instanceof GraphqlResponseError) {
+					if (ex.errors?.some((e) => e.type === "RATE_LIMIT" || e.type === "RATE_LIMITED")) {
+						let resetAt;
+						const reset = ex.headers?.["x-ratelimit-reset"];
+						if (reset != null) {
+							resetAt = parseInt(reset, 10);
+							if (Number.isNaN(resetAt)) resetAt = void 0;
+						}
+						throw new RequestRateLimitError(ex, accessToken, resetAt);
+					}
 					if (allowPartialNotFound === "aliased" && ex.data != null && ex.errors != null && ex.errors.length > 0) {
 						if (ex.errors.every((e) => e.path != null && e.path.length > 0 && e.path[0] in ex.data)) return {
 							data: ex.data,
@@ -1878,16 +1887,6 @@ var GitHubApi = class {
 					switch (ex.errors?.[0]?.type) {
 						case "NOT_FOUND": throw new RequestNotFoundError(ex);
 						case "FORBIDDEN": throw new AuthenticationError(tokenInfo, 3, ex);
-						case "RATE_LIMIT":
-						case "RATE_LIMITED": {
-							let resetAt;
-							const reset = ex.headers?.["x-ratelimit-reset"];
-							if (reset != null) {
-								resetAt = parseInt(reset, 10);
-								if (Number.isNaN(resetAt)) resetAt = void 0;
-							}
-							throw new RequestRateLimitError(ex, accessToken, resetAt);
-						}
 					}
 					if (_logger.isDebugging) this.config.onDebugError?.(`GitHub request failed: ${ex.errors?.[0]?.message ?? ex.message}`);
 				} else if (ex instanceof RequestError || ex.name === "AbortError") this.handleRequestError(provider, token, ex, scope, allowPartialNotFound === "aliased");
@@ -1992,18 +1991,18 @@ var GitHubApi = class {
 				throw new AuthenticationError(tokenInfo, 3, ex);
 			case 500:
 				scope?.error(ex);
-				if (ex.response != null) reportRequestFailure(provider, ex, () => this.config.onRequestError?.(provider, provider == null || provider.id === "github" ? l10n.t("{0} failed to respond and might be experiencing issues. Please visit the [GitHub status page](https://githubstatus.com) for more information.", provider?.name ?? "GitHub") : l10n.t("{0} failed to respond and might be experiencing issues.", provider.name)), deferFailure);
+				if (ex.response != null) reportRequestFailure(provider, ex, () => this.config.onRequestError?.(provider, provider == null || provider.id === "github" ? l10n.t("{0} failed to respond and might be experiencing issues. Please visit the [GitHub status page](https://githubstatus.com) for more information.", provider?.name ?? "GitHub") : l10n.t("{0} failed to respond and might be experiencing issues.", provider.name)), deferFailure, token.connectionId);
 				return;
 			case 502:
 				scope?.error(ex);
 				if (ex.message.includes("timeout")) {
-					reportRequestFailure(provider, ex, () => this.config.onRequestError?.(provider, `${provider?.name ?? "GitHub"} request timed out`), deferFailure);
+					reportRequestFailure(provider, ex, () => this.config.onRequestError?.(provider, `${provider?.name ?? "GitHub"} request timed out`), deferFailure, token.connectionId);
 					return;
 				}
 				break;
 			case 503:
 				scope?.error(ex);
-				reportRequestFailure(provider, ex, () => this.config.onRequestError?.(provider, provider == null || provider.id === "github" ? l10n.t("{0} failed to respond and might be experiencing issues. Please visit the [GitHub status page](https://githubstatus.com) for more information.", provider?.name ?? "GitHub") : l10n.t("{0} failed to respond and might be experiencing issues.", provider.name)), deferFailure);
+				reportRequestFailure(provider, ex, () => this.config.onRequestError?.(provider, provider == null || provider.id === "github" ? l10n.t("{0} failed to respond and might be experiencing issues. Please visit the [GitHub status page](https://githubstatus.com) for more information.", provider?.name ?? "GitHub") : l10n.t("{0} failed to respond and might be experiencing issues.", provider.name)), deferFailure, token.connectionId);
 				return;
 			default: if (ex.status >= 400 && ex.status < 500) throw new RequestClientError(ex);
 		}