deps: make-fetch-happen@13.0.1

npm · Apr 30, 2024 · 432efb5 · 432efb5
1 parent 2558283
commit 432efb5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -81,6 +81,7 @@ graph LR;
   make-fetch-happen-->cacache;
   make-fetch-happen-->minipass-fetch;
   make-fetch-happen-->npmcli-agent["@npmcli/agent"];
+  make-fetch-happen-->proc-log;
   make-fetch-happen-->ssri;
   nopt-->abbrev;
   normalize-package-data-->hosted-git-info;
@@ -427,6 +428,7 @@ graph LR;
   make-fetch-happen-->minipass;
   make-fetch-happen-->negotiator;
   make-fetch-happen-->npmcli-agent["@npmcli/agent"];
+  make-fetch-happen-->proc-log;
   make-fetch-happen-->promise-retry;
   make-fetch-happen-->ssri;
   minimatch-->brace-expansion;

diff --git a/node_modules/make-fetch-happen/lib/cache/entry.js b/node_modules/make-fetch-happen/lib/cache/entry.js
@@ -274,6 +274,8 @@ class CacheEntry {
       const cacheWritePromise = new Promise((resolve, reject) => {
         cacheWriteResolve = resolve
         cacheWriteReject = reject
+      }).catch((err) => {
+        body.emit('error', err)
       })
 
       body = new CachingMinipassPipeline({ events: ['integrity', 'size'] }, new MinipassFlush({

diff --git a/node_modules/make-fetch-happen/lib/remote.js b/node_modules/make-fetch-happen/lib/remote.js
@@ -2,6 +2,7 @@ const { Minipass } = require('minipass')
 const fetch = require('minipass-fetch')
 const promiseRetry = require('promise-retry')
 const ssri = require('ssri')
+const { log } = require('proc-log')
 
 const CachingMinipassPipeline = require('./pipeline.js')
 const { getAgent } = require('@npmcli/agent')
@@ -89,6 +90,8 @@ const remoteFetch = (request, options) => {
           options.onRetry(res)
         }
 
+        /* eslint-disable-next-line max-len */
+        log.http('fetch', `${req.method} ${req.url} attempt ${attemptNum} failed with ${res.status}`)
         return retryHandler(res)
       }
 
@@ -112,6 +115,7 @@ const remoteFetch = (request, options) => {
         options.onRetry(err)
       }
 
+      log.http('fetch', `${req.method} ${req.url} attempt ${attemptNum} failed with ${err.code}`)
       return retryHandler(err)
     }
   }, options.retry).catch((err) => {

diff --git a/node_modules/make-fetch-happen/package.json b/node_modules/make-fetch-happen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "make-fetch-happen",
-  "version": "13.0.0",
+  "version": "13.0.1",
   "description": "Opinionated, caching, retrying fetch client",
   "main": "lib/index.js",
   "files": [
@@ -11,7 +11,7 @@
     "test": "tap",
     "posttest": "npm run lint",
     "eslint": "eslint",
-    "lint": "eslint \"**/*.js\"",
+    "lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
     "lintfix": "npm run lint -- --fix",
     "postlint": "template-oss-check",
     "snap": "tap",
@@ -42,12 +42,13 @@
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.4",
     "negotiator": "^0.6.3",
+    "proc-log": "^4.2.0",
     "promise-retry": "^2.0.1",
     "ssri": "^10.0.0"
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.18.0",
+    "@npmcli/template-oss": "4.21.4",
     "nock": "^13.2.4",
     "safe-buffer": "^5.2.1",
     "standard-version": "^9.3.2",
@@ -68,13 +69,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "ciVersions": [
-      "16.14.0",
-      "16.x",
-      "18.0.0",
-      "18.x"
-    ],
-    "version": "4.18.0",
+    "version": "4.21.4",
     "publish": "true"
   }
 }
diff --git a/package-lock.json b/package-lock.json
@@ -122,7 +122,7 @@
         "libnpmsearch": "^7.0.0",
         "libnpmteam": "^6.0.0",
         "libnpmversion": "^6.0.0",
-        "make-fetch-happen": "^13.0.0",
+        "make-fetch-happen": "^13.0.1",
         "minimatch": "^9.0.4",
         "minipass": "^7.0.4",
         "minipass-pipeline": "^1.2.4",
@@ -7483,9 +7483,9 @@
       }
     },
     "node_modules/make-fetch-happen": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz",
-      "integrity": "sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
+      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
       "inBundle": true,
       "dependencies": {
         "@npmcli/agent": "^2.0.0",
@@ -7497,6 +7497,7 @@
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
         "negotiator": "^0.6.3",
+        "proc-log": "^4.2.0",
         "promise-retry": "^2.0.1",
         "ssri": "^10.0.0"
       },

diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "libnpmsearch": "^7.0.0",
     "libnpmteam": "^6.0.0",
     "libnpmversion": "^6.0.0",
-    "make-fetch-happen": "^13.0.0",
+    "make-fetch-happen": "^13.0.1",
     "minimatch": "^9.0.4",
     "minipass": "^7.0.4",
     "minipass-pipeline": "^1.2.4",