fixup! fixup! fixup! fixup! http,https: add built-in proxy support in http/https.request and Agent

Author: joyeecheung

test/client-proxy/test-http-proxy-request.mjs

@@ -65,7 +65,7 @@ const expectedLogs = [{
 // Check that the lower-cased http_proxy environment variable takes precedence over the
 // upper-cased HTTP_PROXY.
 // On Windows, environment variables are case-insensitive, so this test is not applicable.
-if (common.isWindows) {
+if (!common.isWindows) {
   const proxy2 = http.createServer(common.mustNotCall());
   proxy2.on('connect', common.mustNotCall());
   proxy2.listen(0);

test/client-proxy/test-https-proxy-fetch.mjs

@@ -10,7 +10,7 @@ if (!common.hasCrypto)
 
 // https must be dynamically imported so that builds without crypto support
 // can skip it.
-const https = (await import('node:https')).default;
+const { default: https } = await import('node:https');
 
 // Start a server to process the final request.
 const server = https.createServer({

test/client-proxy/test-https-proxy-request-auth-failure.mjs

@@ -5,13 +5,16 @@ import * as common from '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'node:assert';
 import { once } from 'events';
-import https from 'node:https';
 import http from 'node:http';
 import { runProxiedRequest } from '../common/proxy-server.js';
 
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),
   key: fixtures.readKey('agent8-key.pem'),

test/client-proxy/test-https-proxy-request-connection-refused.mjs

@@ -4,13 +4,16 @@ import * as common from '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'node:assert';
 import { once } from 'events';
-import https from 'node:https';
 import { runProxiedRequest } from '../common/proxy-server.js';
 import dgram from 'node:dgram';
 
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),
   key: fixtures.readKey('agent8-key.pem'),

test/client-proxy/test-https-proxy-request-empty-response.mjs

@@ -5,13 +5,16 @@ import * as common from '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'node:assert';
 import { once } from 'events';
-import https from 'node:https';
 import http from 'node:http';
 import { runProxiedRequest } from '../common/proxy-server.js';
 
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),
   key: fixtures.readKey('agent8-key.pem'),

test/client-proxy/test-https-proxy-request-handshake-failure.mjs

@@ -5,12 +5,15 @@ import * as common from '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'node:assert';
 import { once } from 'events';
-import https from 'node:https';
 import { runProxiedRequest, createProxyServer } from '../common/proxy-server.js';
 
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),
   key: fixtures.readKey('agent8-key.pem'),

test/client-proxy/test-https-proxy-request-https-proxy.mjs

@@ -5,14 +5,17 @@
 import * as common from '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'node:assert';
-import https from 'node:https';
 import { once } from 'events';
 import { createProxyServer, runProxiedRequest } from '../common/proxy-server.js';
 
 if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 // Start a server to process the final request.
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),

test/client-proxy/test-https-proxy-request-incomplete-headers.mjs

@@ -5,12 +5,15 @@ import * as common from '../common/index.mjs';
 import fixtures from '../common/fixtures.js';
 import assert from 'node:assert';
 import { once } from 'events';
-import https from 'node:https';
 import http from 'node:http';
 import { runProxiedRequest } from '../common/proxy-server.js';
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),
   key: fixtures.readKey('agent8-key.pem'),

test/client-proxy/test-https-proxy-request-invalid-char-in-options.mjs

@@ -3,10 +3,16 @@
 
 import * as common from '../common/index.mjs';
 import assert from 'node:assert';
-import https from 'node:https';
 import { once } from 'events';
 import fixtures from '../common/fixtures.js';
 
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
+
 const server = https.createServer({
   cert: fixtures.readKey('agent8-cert.pem'),
   key: fixtures.readKey('agent8-key.pem'),

test/client-proxy/test-https-proxy-request-invalid-char-in-url.mjs

@@ -4,14 +4,17 @@
 import * as common from '../common/index.mjs';
 import assert from 'node:assert';
 import fixtures from '../common/fixtures.js';
-import https from 'node:https';
 import { once } from 'events';
 import { inspect } from 'node:util';
 import { createProxyServer } from '../common/proxy-server.js';
 
 if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
+
+// https must be dynamically imported so that builds without crypto support
+// can skip it.
+const { default: https } = await import('node:https');
 const requests = new Set();
 
 const server = https.createServer({