Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Playwright/Core/APIRequestContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ public async Task<IAPIResponse> FetchAsync(string url, APIRequestContextOptions?
["ignoreHTTPSErrors"] = options?.IgnoreHTTPSErrors,
["maxRedirects"] = options?.MaxRedirects,
["maxRetries"] = options?.MaxRetries,
["timeout"] = _timeoutSettings.Timeout(options?.Timeout),
["params"] = options?.Params?.ToDictionary(x => x.Key, x => x.Value.ToString()).ToProtocol(),
["encodedParams"] = options?.ParamsString,
["headers"] = options?.Headers?.ToProtocol(),
Expand All @@ -157,7 +156,7 @@ public async Task<IAPIResponse> FetchAsync(string url, APIRequestContextOptions?
["multipartData"] = (options?.Multipart as FormData)?.ToProtocol(),
};

var response = await SendMessageToServerAsync("fetch", message).ConfigureAwait(false);
var response = await SendMessageToServerAsync("fetch", message, timeout: _timeoutSettings.Timeout(options?.Timeout)).ConfigureAwait(false);
return new APIResponse(this, response?.GetProperty("response").ToObject<Transport.Protocol.APIResponse>()!);
}

Expand Down
29 changes: 15 additions & 14 deletions src/Playwright/Core/BrowserType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public async Task<IBrowser> LaunchAsync(BrowserTypeLaunchOptions? options = defa
{ "firefoxUserPrefs", options.FirefoxUserPrefs },
{ "chromiumSandbox", options.ChromiumSandbox },
{ "slowMo", options.SlowMo },
{ "timeout", TimeoutSettings.LaunchTimeout(options.Timeout) },
}).ConfigureAwait(false);
},
timeout: TimeoutSettings.LaunchTimeout(options.Timeout)).ConfigureAwait(false);
browser.ConnectToBrowserType(this, options.TracesDir);
return browser;
}
Expand All @@ -100,7 +100,6 @@ public async Task<IBrowserContext> LaunchPersistentContextAsync(string userDataD
["handleSIGINT"] = options.HandleSIGINT,
["handleSIGTERM"] = options.HandleSIGTERM,
["handleSIGHUP"] = options.HandleSIGHUP,
["timeout"] = TimeoutSettings.LaunchTimeout(options.Timeout),
["env"] = options.Env?.ToProtocol(),
["slowMo"] = options.SlowMo,
["ignoreHTTPSErrors"] = options.IgnoreHTTPSErrors,
Expand Down Expand Up @@ -147,7 +146,7 @@ public async Task<IBrowserContext> LaunchPersistentContextAsync(string userDataD
channelArgs.Add("viewport", options.ViewportSize);
}

JsonElement result = await SendMessageToServerAsync<JsonElement>("launchPersistentContext", channelArgs).ConfigureAwait(false);
JsonElement result = await SendMessageToServerAsync<JsonElement>("launchPersistentContext", channelArgs, timeout: TimeoutSettings.LaunchTimeout(options.Timeout)).ConfigureAwait(false);
var browser = result.GetProperty("browser").ToObject<Browser>(_connection.DefaultJsonSerializerOptions)!;
browser.ConnectToBrowserType(this, options.TracesDir);
var context = result.GetProperty("context").ToObject<BrowserContext>(_connection.DefaultJsonSerializerOptions)!;
Expand Down Expand Up @@ -263,16 +262,18 @@ public async Task<IBrowser> ConnectOverCDPAsync(string endpointURL, BrowserTypeC
throw new ArgumentException("Connecting over CDP is only supported in Chromium.");
}
options ??= new BrowserTypeConnectOverCDPOptions();
JsonElement result = await SendMessageToServerAsync<JsonElement>("connectOverCDP", new Dictionary<string, object?>
{
{ "endpointURL", endpointURL },
{ "headers", options.Headers?.ToProtocol() },
{ "slowMo", options.SlowMo },
{ "timeout", TimeoutSettings.LaunchTimeout(options.Timeout) },
{ "isLocal", options.IsLocal },
{ "noDefaults", options.NoDefaults },
{ "artifactsDir", options.ArtifactsDir },
}).ConfigureAwait(false);
JsonElement result = await SendMessageToServerAsync<JsonElement>(
"connectOverCDP",
new Dictionary<string, object?>
{
{ "endpointURL", endpointURL },
{ "headers", options.Headers?.ToProtocol() },
{ "slowMo", options.SlowMo },
{ "isLocal", options.IsLocal },
{ "noDefaults", options.NoDefaults },
{ "artifactsDir", options.ArtifactsDir },
},
timeout: TimeoutSettings.LaunchTimeout(options.Timeout)).ConfigureAwait(false);
Browser browser = result.GetProperty("browser").ToObject<Browser>(_connection.DefaultJsonSerializerOptions);
browser.ConnectToBrowserType(this, null);
return browser;
Expand Down
Loading
Loading