-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Even more deps updates #7498
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.
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
Merged
Merged
Even more deps updates #7498
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
32e7596
deps: [email protected]
lukekarrys f6dc65b
deps: @npmcli/[email protected]
lukekarrys 76fcfad
deps: @sigstore/[email protected]
lukekarrys f0ca7a7
deps: [email protected]
lukekarrys 2151d29
deps: @sigstore/[email protected]
lukekarrys File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| "use strict"; | ||
| var __importDefault = (this && this.__importDefault) || function (mod) { | ||
| return (mod && mod.__esModule) ? mod : { "default": mod }; | ||
| }; | ||
| Object.defineProperty(exports, "__esModule", { value: true }); | ||
| exports.fetchWithRetry = void 0; | ||
| /* | ||
| Copyright 2023 The Sigstore Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| const http2_1 = require("http2"); | ||
| const make_fetch_happen_1 = __importDefault(require("make-fetch-happen")); | ||
| const proc_log_1 = require("proc-log"); | ||
| const promise_retry_1 = __importDefault(require("promise-retry")); | ||
| const util_1 = require("../util"); | ||
| const error_1 = require("./error"); | ||
| const { HTTP2_HEADER_LOCATION, HTTP2_HEADER_CONTENT_TYPE, HTTP2_HEADER_USER_AGENT, HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_TOO_MANY_REQUESTS, HTTP_STATUS_REQUEST_TIMEOUT, } = http2_1.constants; | ||
| async function fetchWithRetry(url, options) { | ||
| return (0, promise_retry_1.default)(async (retry, attemptNum) => { | ||
| const method = options.method || 'POST'; | ||
| const headers = { | ||
| [HTTP2_HEADER_USER_AGENT]: util_1.ua.getUserAgent(), | ||
| ...options.headers, | ||
| }; | ||
| const response = await (0, make_fetch_happen_1.default)(url, { | ||
| method, | ||
| headers, | ||
| body: options.body, | ||
| timeout: options.timeout, | ||
| retry: false, // We're handling retries ourselves | ||
| }).catch((reason) => { | ||
| proc_log_1.log.http('fetch', `${method} ${url} attempt ${attemptNum} failed with ${reason}`); | ||
| return retry(reason); | ||
| }); | ||
| if (response.ok) { | ||
| return response; | ||
| } | ||
| else { | ||
| const error = await errorFromResponse(response); | ||
| proc_log_1.log.http('fetch', `${method} ${url} attempt ${attemptNum} failed with ${response.status}`); | ||
| if (retryable(response.status)) { | ||
| return retry(error); | ||
| } | ||
| else { | ||
| throw error; | ||
| } | ||
| } | ||
| }, retryOpts(options.retry)); | ||
| } | ||
| exports.fetchWithRetry = fetchWithRetry; | ||
| // Translate a Response into an HTTPError instance. This will attempt to parse | ||
| // the response body for a message, but will default to the statusText if none | ||
| // is found. | ||
| const errorFromResponse = async (response) => { | ||
| let message = response.statusText; | ||
| const location = response.headers?.get(HTTP2_HEADER_LOCATION) || undefined; | ||
| const contentType = response.headers?.get(HTTP2_HEADER_CONTENT_TYPE); | ||
| // If response type is JSON, try to parse the body for a message | ||
| if (contentType?.includes('application/json')) { | ||
| try { | ||
| const body = await response.json(); | ||
| message = body.message || message; | ||
| } | ||
| catch (e) { | ||
| // ignore | ||
| } | ||
| } | ||
| return new error_1.HTTPError({ | ||
| status: response.status, | ||
| message: message, | ||
| location: location, | ||
| }); | ||
| }; | ||
| // Determine if a status code is retryable. This includes 5xx errors, 408, and | ||
| // 429. | ||
| const retryable = (status) => [HTTP_STATUS_REQUEST_TIMEOUT, HTTP_STATUS_TOO_MANY_REQUESTS].includes(status) || status >= HTTP_STATUS_INTERNAL_SERVER_ERROR; | ||
| // Normalize the retry options to the format expected by promise-retry | ||
| const retryOpts = (retry) => { | ||
| if (typeof retry === 'boolean') { | ||
| return { retries: retry ? 1 : 0 }; | ||
| } | ||
| else if (typeof retry === 'number') { | ||
| return { retries: retry }; | ||
| } | ||
| else { | ||
| return { retries: 0, ...retry }; | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.