Skip to content

Commit

Permalink
use undici
Browse files Browse the repository at this point in the history
  • Loading branch information
benmccann committed Jun 30, 2024
1 parent e8bde1b commit 428ee03
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ exports.usage = 'Attempts to install pre-built binary for module';
const fs = require('fs');
const path = require('path');
const log = require('npmlog');
const { ProxyAgent } = require('undici');
const existsAsync = fs.exists || path.exists;
const versioning = require('./util/versioning.js');
const napi = require('./util/napi.js');
Expand Down Expand Up @@ -55,7 +56,6 @@ function place_binary(uri, targetDir, opts, callback) {
process.env.npm_config_proxy;
let agent;
if (proxyUrl) {
const ProxyAgent = require('https-proxy-agent');
agent = new ProxyAgent(proxyUrl);
log.http('download', 'proxy agent configured using: "%s"', proxyUrl);
}
Expand Down
30 changes: 26 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
},
"dependencies": {
"detect-libc": "^2.0.0",
"https-proxy-agent": "^5.0.0",
"make-dir": "^3.1.0",
"nopt": "^7.2.1",
"npmlog": "^7.0.1",
"rimraf": "^5.0.5",
"semver": "^7.3.5",
"tar": "^7.4.0"
"tar": "^7.4.0",
"undici": "^6.19.2"
},
"devDependencies": {
"@mapbox/cloudfriend": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions test/proxy-bcrypt.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { createUnzip } = require('zlib');
const os = require('os');

const tar = require('tar-fs');
const Agent = require('https-proxy-agent');
const { ProxyAgent } = require('undici');
const fetch = require('node-fetch');
const { rimraf } = require('rimraf');

Expand Down Expand Up @@ -44,7 +44,7 @@ test('setup proxy server', (t) => {
proxy.startServer({ port: proxyPort });
process.env.https_proxy = process.env.http_proxy = proxyServer;

options.agent = new Agent(proxyServer);
options.dispatcher = new ProxyAgent(proxyServer);

// make sure the download directory deleted then create an empty one
rimraf(downloadDir).then(() => {
Expand Down

0 comments on commit 428ee03

Please sign in to comment.