Skip to content

Commit 82deab6

Browse files
wraithgarwraithgar
committed
1 parent 920e5ed commit 82deab6

5 files changed

Lines changed: 14 additions & 8 deletions

File tree

‎DEPENDENCIES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ graph LR;
7979
make-fetch-happen-->cacache;
8080
make-fetch-happen-->minipass-fetch;
8181
make-fetch-happen-->npmcli-agent["@npmcli/agent"];
82+
make-fetch-happen-->npmcli-redact["@npmcli/redact"];
8283
make-fetch-happen-->proc-log;
8384
make-fetch-happen-->ssri;
8485
nopt-->abbrev;
@@ -387,6 +388,7 @@ graph LR;
387388
make-fetch-happen-->minipass;
388389
make-fetch-happen-->negotiator;
389390
make-fetch-happen-->npmcli-agent["@npmcli/agent"];
391+
make-fetch-happen-->npmcli-redact["@npmcli/redact"];
390392
make-fetch-happen-->proc-log;
391393
make-fetch-happen-->ssri;
392394
minimatch-->brace-expansion;

‎node_modules/make-fetch-happen/lib/remote.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const fetch = require('minipass-fetch')
33
const { promiseRetry } = require('@gar/promise-retry')
44
const ssri = require('ssri')
55
const { log } = require('proc-log')
6+
const { redact: cleanUrl } = require('@npmcli/redact')
67

78
const CachingMinipassPipeline = require('./pipeline.js')
89
const { getAgent } = require('@npmcli/agent')
@@ -55,6 +56,7 @@ const remoteFetch = (request, options) => {
5556

5657
return promiseRetry(async (retryHandler, attemptNum) => {
5758
const req = new fetch.Request(request, _opts)
59+
const url = cleanUrl(req.url)
5860
try {
5961
let res = await fetch(req, _opts)
6062
if (_opts.integrity && res.status === 200) {
@@ -92,7 +94,7 @@ const remoteFetch = (request, options) => {
9294
}
9395

9496
/* eslint-disable-next-line max-len */
95-
log.http('fetch', `${req.method} ${req.url} attempt ${attemptNum} failed with ${res.status}`)
97+
log.http('fetch', `${req.method} ${url} attempt ${attemptNum} failed with ${res.status}`)
9698
return retryHandler(res)
9799
}
98100

@@ -116,7 +118,7 @@ const remoteFetch = (request, options) => {
116118
options.onRetry(err)
117119
}
118120

119-
log.http('fetch', `${req.method} ${req.url} attempt ${attemptNum} failed with ${err.code}`)
121+
log.http('fetch', `${req.method} ${url} attempt ${attemptNum} failed with ${err.code}`)
120122
return retryHandler(err)
121123
}
122124
}, options.retry).catch((err) => {

‎node_modules/make-fetch-happen/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "make-fetch-happen",
3-
"version": "15.0.4",
3+
"version": "15.0.5",
44
"description": "Opinionated, caching, retrying fetch client",
55
"main": "lib/index.js",
66
"files": [
@@ -35,6 +35,7 @@
3535
"dependencies": {
3636
"@gar/promise-retry": "^1.0.0",
3737
"@npmcli/agent": "^4.0.0",
38+
"@npmcli/redact": "^4.0.0",
3839
"cacache": "^20.0.1",
3940
"http-cache-semantics": "^4.1.1",
4041
"minipass": "^7.0.2",

‎package-lock.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"libnpmsearch": "^9.0.1",
119119
"libnpmteam": "^8.0.2",
120120
"libnpmversion": "^8.0.3",
121-
"make-fetch-happen": "^15.0.4",
121+
"make-fetch-happen": "^15.0.5",
122122
"minimatch": "^10.2.4",
123123
"minipass": "^7.1.3",
124124
"minipass-pipeline": "^1.2.4",
@@ -7377,14 +7377,15 @@
73777377
}
73787378
},
73797379
"node_modules/make-fetch-happen": {
7380-
"version": "15.0.4",
7381-
"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.4.tgz",
7382-
"integrity": "sha512-vM2sG+wbVeVGYcCm16mM3d5fuem9oC28n436HjsGO3LcxoTI8LNVa4rwZDn3f76+cWyT4GGJDxjTYU1I2nr6zw==",
7380+
"version": "15.0.5",
7381+
"resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz",
7382+
"integrity": "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg==",
73837383
"inBundle": true,
73847384
"license": "ISC",
73857385
"dependencies": {
73867386
"@gar/promise-retry": "^1.0.0",
73877387
"@npmcli/agent": "^4.0.0",
7388+
"@npmcli/redact": "^4.0.0",
73887389
"cacache": "^20.0.1",
73897390
"http-cache-semantics": "^4.1.1",
73907391
"minipass": "^7.0.2",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"libnpmsearch": "^9.0.1",
8787
"libnpmteam": "^8.0.2",
8888
"libnpmversion": "^8.0.3",
89-
"make-fetch-happen": "^15.0.4",
89+
"make-fetch-happen": "^15.0.5",
9090
"minimatch": "^10.2.4",
9191
"minipass": "^7.1.3",
9292
"minipass-pipeline": "^1.2.4",

0 commit comments

Comments
 (0)