deps: [email protected]

DEPENDENCIES.md

@@ -82,6 +82,7 @@ graph LR;
   libnpmversion-->semver;
   make-fetch-happen-->cacache;
   make-fetch-happen-->minipass-fetch;
+  make-fetch-happen-->npmcli-agent["@npmcli/agent"];
   make-fetch-happen-->ssri;
   nopt-->abbrev;
   normalize-package-data-->hosted-git-info;
@@ -259,8 +260,6 @@ graph LR;
 ```mermaid
 graph LR;
   agent-base-->debug;
-  agentkeepalive-->debug;
-  agentkeepalive-->depd;
   agentkeepalive-->humanize-ms;
   aggregate-error-->clean-stack;
   aggregate-error-->indent-string;
@@ -460,6 +459,7 @@ graph LR;
   make-fetch-happen-->minipass-pipeline;
   make-fetch-happen-->minipass;
   make-fetch-happen-->negotiator;
+  make-fetch-happen-->npmcli-agent["@npmcli/agent"];
   make-fetch-happen-->promise-retry;
   make-fetch-happen-->socks-proxy-agent;
   make-fetch-happen-->ssri;
@@ -598,6 +598,8 @@ graph LR;
   npm-registry-fetch-->minizlib;
   npm-registry-fetch-->npm-package-arg;
   npm-registry-fetch-->proc-log;
+  npmcli-agent-->lru-cache;
+  npmcli-agent-->socks;
   npmcli-arborist-->benchmark;
   npmcli-arborist-->bin-links;
   npmcli-arborist-->cacache;
@@ -828,4 +830,4 @@ packages higher up the chain.
  - @npmcli/git, make-fetch-happen, @npmcli/config, init-package-json
  - @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, npm-pick-manifest, @npmcli/run-script, read-package-json, promzard
  - @npmcli/docs, @npmcli/fs, npm-bundled, read-package-json-fast, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, bin-links, nopt, npmlog, parse-conflict-json, @npmcli/mock-globals, read
- - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, minify-registry-metadata, ini, @npmcli/disparity-colors, mute-stream, npm-audit-report, npm-user-validate
+ - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, minify-registry-metadata, ini, @npmcli/disparity-colors, mute-stream, @npmcli/agent, npm-audit-report, npm-user-validate

node_modules/.gitignore

@@ -27,6 +27,7 @@
 !/@npmcli/metavuln-calculator
 !/@npmcli/metavuln-calculator/node_modules/
 /@npmcli/metavuln-calculator/node_modules/*
+!/@npmcli/metavuln-calculator/node_modules/make-fetch-happen
 !/@npmcli/metavuln-calculator/node_modules/npm-registry-fetch
 !/@npmcli/metavuln-calculator/node_modules/pacote
 !/@npmcli/name-from-folder
@@ -97,7 +98,6 @@
 !/debug/node_modules/ms
 !/defaults
 !/delegates
-!/depd
 !/diff
 !/eastasianwidth
 !/emoji-regex
@@ -149,6 +149,9 @@
 !/just-diff
 !/lru-cache
 !/make-fetch-happen
+!/make-fetch-happen/node_modules/
+/make-fetch-happen/node_modules/*
+!/make-fetch-happen/node_modules/minipass
 !/minimatch
 !/minipass-collect
 !/minipass-collect/node_modules/
@@ -188,6 +191,7 @@
 !/node-gyp/node_modules/brace-expansion
 !/node-gyp/node_modules/gauge
 !/node-gyp/node_modules/glob
+!/node-gyp/node_modules/make-fetch-happen
 !/node-gyp/node_modules/minimatch
 !/node-gyp/node_modules/nopt
 !/node-gyp/node_modules/npmlog
@@ -207,7 +211,6 @@
 !/npm-registry-fetch
 !/npm-registry-fetch/node_modules/
 /npm-registry-fetch/node_modules/*
-!/npm-registry-fetch/node_modules/make-fetch-happen
 !/npm-registry-fetch/node_modules/minipass
 !/npm-user-validate
 !/npmlog
@@ -256,6 +259,9 @@
 !/shebang-regex
 !/signal-exit
 !/sigstore
+!/sigstore/node_modules/
+/sigstore/node_modules/*
+!/sigstore/node_modules/make-fetch-happen
 !/smart-buffer
 !/socks-proxy-agent
 !/socks
@@ -281,6 +287,9 @@
 !/tiny-relative-date
 !/treeverse
 !/tuf-js
+!/tuf-js/node_modules/
+/tuf-js/node_modules/*
+!/tuf-js/node_modules/make-fetch-happen
 !/unique-filename
 !/unique-slug
 !/util-deprecate

node_modules/npm-registry-fetch/node_modules/make-fetch-happen/lib/remote.js → node_modules/@npmcli/metavuln-calculator/node_modules/make-fetch-happen/lib/remote.js

@@ -4,7 +4,7 @@ const promiseRetry = require('promise-retry')
 const ssri = require('ssri')
 
 const CachingMinipassPipeline = require('./pipeline.js')
-const { getAgent } = require('@npmcli/agent')
+const getAgent = require('./agent.js')
 const pkg = require('../package.json')
 
 const USER_AGENT = `${pkg.name}/${pkg.version} (+https://npm.im/${pkg.name})`
@@ -14,15 +14,9 @@ const RETRY_ERRORS = [
   'ECONNREFUSED', // remote host refused to open connection
   'EADDRINUSE', // failed to bind to a local port (proxy?)
   'ETIMEDOUT', // someone in the transaction is WAY TOO SLOW
-  // from @npmcli/agent
-  'ECONNECTIONTIMEOUT',
-  'EIDLETIMEOUT',
-  'ERESPONSETIMEOUT',
-  'ETRANSFERTIMEOUT',
+  'ERR_SOCKET_TIMEOUT', // same as above, but this one comes from agentkeepalive
   // Known codes we do NOT retry on:
   // ENOTFOUND (getaddrinfo failure. Either bad hostname, or offline)
-  // EINVALIDPROXY // invalid protocol from @npmcli/agent
-  // EINVALIDRESPONSE // invalid status code from @npmcli/agent
 ]
 
 const RETRY_TYPES = [

node_modules/npm-registry-fetch/node_modules/make-fetch-happen/package.json → node_modules/@npmcli/metavuln-calculator/node_modules/make-fetch-happen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-fetch-happen",
-  "version": "12.0.0",
+  "version": "11.1.1",
   "description": "Opinionated, caching, retrying fetch client",
   "main": "lib/index.js",
   "files": [
@@ -33,28 +33,32 @@
   "author": "GitHub Inc.",
   "license": "ISC",
   "dependencies": {
-    "@npmcli/agent": "^1.1.0",
+    "agentkeepalive": "^4.2.1",
     "cacache": "^17.0.0",
     "http-cache-semantics": "^4.1.1",
+    "http-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^5.0.0",
     "is-lambda": "^1.0.1",
-    "minipass": "^7.0.2",
+    "lru-cache": "^7.7.1",
+    "minipass": "^5.0.0",
     "minipass-fetch": "^3.0.0",
     "minipass-flush": "^1.0.5",
     "minipass-pipeline": "^1.2.4",
     "negotiator": "^0.6.3",
     "promise-retry": "^2.0.1",
+    "socks-proxy-agent": "^7.0.0",
     "ssri": "^10.0.0"
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.18.0",
+    "@npmcli/template-oss": "4.14.1",
     "nock": "^13.2.4",
     "safe-buffer": "^5.2.1",
     "standard-version": "^9.3.2",
     "tap": "^16.0.0"
   },
   "engines": {
-    "node": "^16.13.0 || >=18.0.0"
+    "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
   },
   "tap": {
     "color": 1,
@@ -68,13 +72,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "ciVersions": [
-      "16.13.0",
-      "16.x",
-      "18.0.0",
-      "18.x"
-    ],
-    "version": "4.18.0",
+    "version": "4.14.1",
     "publish": "true"
   }
 }

node_modules/agentkeepalive/History.md

@@ -1,4 +1,16 @@
 
+4.5.0 / 2023-08-06
+==================
+
+**others**
+  * [[`1e5e312`](http://github.com/node-modules/agentkeepalive/commit/1e5e312f36491243372dbfee0dd47607e7b3d94a)] - deps: remove debug and depd (#114) (fengmk2 <<[email protected]>>)
+
+4.4.0 / 2023-08-05
+==================
+
+**features**
+  * [[`c7c1e93`](http://github.com/node-modules/agentkeepalive/commit/c7c1e93beba7310d7c2cc9647dd211a686d21cac)] - feat: return socket from createConnection (#113) (Nabeel Bukhari <<[email protected]>>)
+
 4.3.0 / 2023-03-06
 ==================
 

node_modules/agentkeepalive/lib/agent.js

@@ -2,8 +2,7 @@
 
 const OriginalAgent = require('http').Agent;
 const ms = require('humanize-ms');
-const debug = require('debug')('agentkeepalive');
-const deprecate = require('depd')('agentkeepalive');
+const debug = require('util').debuglog('agentkeepalive');
 const {
   INIT_SOCKET,
   CURRENT_ID,
@@ -27,6 +26,10 @@ if (majorVersion >= 11 && majorVersion <= 12) {
   defaultTimeoutListenerCount = 3;
 }
 
+function deprecate(message) {
+  console.log('[agentkeepalive:deprecated] %s', message);
+}
+
 class Agent extends OriginalAgent {
   constructor(options) {
     options = options || {};
@@ -230,6 +233,7 @@ class Agent extends OriginalAgent {
 
     const newSocket = super.createConnection(options, onNewCreate);
     if (newSocket) onNewCreate(null, newSocket);
+    return newSocket;
   }
 
   get statusChanged() {

node_modules/agentkeepalive/lib/https_agent.js

@@ -25,8 +25,8 @@ class HttpsAgent extends HttpAgent {
     };
   }
 
-  createConnection(options) {
-    const socket = this[CREATE_HTTPS_CONNECTION](options);
+  createConnection(options, oncreate) {
+    const socket = this[CREATE_HTTPS_CONNECTION](options, oncreate);
     this[INIT_SOCKET](socket, options);
     return socket;
   }

node_modules/agentkeepalive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentkeepalive",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "Missing keepalive http.Agent",
   "main": "index.js",
   "browser": "browser.js",
@@ -14,7 +14,7 @@
     "contributor": "git-contributor",
     "test": "npm run lint && egg-bin test --full-trace",
     "test-local": "egg-bin test --full-trace",
-    "cov": "cross-env DEBUG=agentkeepalive egg-bin cov --full-trace",
+    "cov": "cross-env NODE_DEBUG=agentkeepalive egg-bin cov --full-trace",
     "ci": "npm run lint && npm run cov",
     "lint": "eslint lib test index.js"
   },
@@ -35,8 +35,6 @@
     "HttpsAgent"
   ],
   "dependencies": {
-    "debug": "^4.1.0",
-    "depd": "^2.0.0",
     "humanize-ms": "^1.2.1"
   },
   "devDependencies": {