playwright-core 1.54.0-beta-1752237221000 → 1.54.0

package/lib/server/utils/network.js

@@ -41,14 +41,12 @@ module.exports = __toCommonJS(network_exports);
 var import_http = __toESM(require("http"));
 var import_http2 = __toESM(require("http2"));
 var import_https = __toESM(require("https"));
-var import_url = __toESM(require("url"));
 var import_utilsBundle = require("../../utilsBundle");
 var import_happyEyeballs = require("./happyEyeballs");
 const NET_DEFAULT_TIMEOUT = 3e4;
 function httpRequest(params, onResponse, onError) {
-  const parsedUrl = import_url.default.parse(params.url);
-  let options = {
-    ...parsedUrl,
+  const parsedUrl = new URL(params.url);
+  const options = {
     agent: parsedUrl.protocol === "https:" ? import_happyEyeballs.httpsHappyEyeballsAgent : import_happyEyeballs.httpHappyEyeballsAgent,
     method: params.method || "GET",
     headers: params.headers
@@ -57,18 +55,15 @@ function httpRequest(params, onResponse, onError) {
     options.rejectUnauthorized = params.rejectUnauthorized;
   const proxyURL = (0, import_utilsBundle.getProxyForUrl)(params.url);
   if (proxyURL) {
-    const parsedProxyURL = import_url.default.parse(proxyURL);
+    const parsedProxyURL = new URL(proxyURL);
     if (params.url.startsWith("http:")) {
-      options = {
-        path: parsedUrl.href,
-        host: parsedProxyURL.hostname,
-        port: parsedProxyURL.port,
-        headers: options.headers,
-        method: options.method
-      };
+      parsedUrl.pathname = parsedUrl.href;
+      parsedUrl.host = parsedProxyURL.host;
     } else {
-      parsedProxyURL.secureProxy = parsedProxyURL.protocol === "https:";
-      options.agent = new import_utilsBundle.HttpsProxyAgent(parsedProxyURL);
+      options.agent = new import_utilsBundle.HttpsProxyAgent({
+        ...convertURLtoLegacyUrl(parsedProxyURL),
+        secureProxy: parsedProxyURL.protocol === "https:"
+      });
       options.rejectUnauthorized = false;
     }
   }
@@ -82,7 +77,7 @@ function httpRequest(params, onResponse, onError) {
       onResponse(res);
     }
   };
-  const request = options.protocol === "https:" ? import_https.default.request(options, requestCallback) : import_http.default.request(options, requestCallback);
+  const request = options.protocol === "https:" ? import_https.default.request(parsedUrl, options, requestCallback) : import_http.default.request(parsedUrl, options, requestCallback);
   request.on("error", onError);
   if (params.socketTimeout !== void 0) {
     request.setTimeout(params.socketTimeout, () => {
@@ -131,19 +126,21 @@ function createProxyAgent(proxy, forUrl) {
   let proxyServer = proxy.server.trim();
   if (!/^\w+:\/\//.test(proxyServer))
     proxyServer = "http://" + proxyServer;
-  const proxyOpts = import_url.default.parse(proxyServer);
+  const proxyOpts = new URL(proxyServer);
   if (proxyOpts.protocol?.startsWith("socks")) {
     return new import_utilsBundle.SocksProxyAgent({
       host: proxyOpts.hostname,
       port: proxyOpts.port || void 0
     });
   }
-  if (proxy.username)
-    proxyOpts.auth = `${proxy.username}:${proxy.password || ""}`;
+  if (proxy.username) {
+    proxyOpts.username = proxy.username;
+    proxyOpts.password = proxy.password || "";
+  }
   if (forUrl && ["ws:", "wss:"].includes(forUrl.protocol)) {
-    return new import_utilsBundle.HttpsProxyAgent(proxyOpts);
+    return new import_utilsBundle.HttpsProxyAgent(convertURLtoLegacyUrl(proxyOpts));
   }
-  return new import_utilsBundle.HttpsProxyAgent(proxyOpts);
+  return new import_utilsBundle.HttpsProxyAgent(convertURLtoLegacyUrl(proxyOpts));
 }
 function createHttpServer(...args) {
   const server = import_http.default.createServer(...args);
@@ -203,6 +200,22 @@ function decorateServer(server) {
     return close.call(server, callback);
   };
 }
+function convertURLtoLegacyUrl(url2) {
+  return {
+    auth: url2.username ? url2.username + ":" + url2.password : null,
+    hash: url2.hash || null,
+    host: url2.hostname ? url2.hostname + ":" + url2.port : null,
+    hostname: url2.hostname || null,
+    href: url2.href,
+    path: url2.pathname + url2.search,
+    pathname: url2.pathname,
+    protocol: url2.protocol,
+    search: url2.search || null,
+    slashes: true,
+    port: url2.port || null,
+    query: url2.search.slice(1) || null
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   NET_DEFAULT_TIMEOUT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playwright-core",
-  "version": "1.54.0-beta-1752237221000",
+  "version": "1.54.0",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",