Skip to content

Commit c65c6d8

Browse files
authored
Implement BrowserFetcher (#342)
1 parent 73cce69 commit c65c6d8

File tree

25 files changed

+438
-280
lines changed

25 files changed

+438
-280
lines changed

ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ E.g.
1919
```csharp
2020
// Arrange
2121
var options = new LaunchOptions { /* */ };
22-
var chromiumRevision = Downloader.DefaultRevision;
22+
var chromiumRevision = BrowserFetcher.DefaultRevision;
2323
var browser = await Puppeteer.LaunchAsync(options, chromiumRevision);
2424
var page = browser.NewPageAsync();
2525

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ Puppeteer Sharp is a .NET port of the official [Node.JS Puppeteer API](https://g
2525
## Take screenshots
2626

2727
```cs
28-
await Downloader.CreateDefault().DownloadRevisionAsync(chromiumRevision);
28+
await Downloader.CreateDefault().DownloadAsync(chromiumRevision);
2929
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
3030
{
3131
Headless = true
32-
}, chromiumRevision);
32+
});
3333
var page = await browser.NewPageAsync();
3434
await page.GoToAsync("http://www.google.com");
3535
await page.ScreenshotAsync(outputFile);
@@ -50,11 +50,11 @@ await page.SetViewport(new ViewPortOptions
5050
## Generate PDF files
5151

5252
```cs
53-
await Downloader.CreateDefault().DownloadRevisionAsync(chromiumRevision);
53+
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
5454
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
5555
{
5656
Headless = true
57-
}, chromiumRevision);
57+
});
5858
var page = await browser.NewPageAsync();
5959
await page.GoToAsync("http://www.google.com");
6060
await page.PdfAsync(outputFile);

demos/PuppeteerSharpPdfDemo/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public static async Task Main(string[] args)
1616
};
1717

1818
Console.WriteLine("Downloading chromium");
19-
await Downloader.CreateDefault().DownloadRevisionAsync(Downloader.DefaultRevision);
19+
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
2020

2121
Console.WriteLine("Navigating google");
22-
using (var browser = await Puppeteer.LaunchAsync(options, Downloader.DefaultRevision))
22+
using (var browser = await Puppeteer.LaunchAsync(options))
2323
using (var page = await browser.NewPageAsync())
2424
{
2525
await page.GoToAsync("http://www.google.com");

docfx_project/api/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Puppeteer Sharp is a .NET port of the official [Node.JS Puppeteer API](https://g
77
## Take screenshots
88

99
```cs
10-
await Downloader.CreateDefault().DownloadRevisionAsync(chromiumRevision);
10+
await Downloader.CreateDefault().DownloadAsync(chromiumRevision);
1111
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
1212
{
1313
Headless = true
14-
}, chromiumRevision);
14+
});
1515
var page = await browser.NewPageAsync();
1616
await page.GoToAsync("http://www.google.com");
1717
await page.ScreenshotAsync(outputFile);
@@ -32,11 +32,11 @@ await page.SetViewport(new ViewPortOptions
3232
## Generate PDF files
3333

3434
```cs
35-
await Downloader.CreateDefault().DownloadRevisionAsync(chromiumRevision);
35+
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
3636
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
3737
{
3838
Headless = true
39-
}, chromiumRevision);
39+
});
4040
var page = await browser.NewPageAsync();
4141
await page.GoToAsync("http://www.google.com");
4242
await page.PdfAsync(outputFile);

docfx_project/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Puppeteer Sharp is a .NET port of the official [Node.JS Puppeteer API](https://g
77
## Take screenshots
88

99
```cs
10-
await Downloader.CreateDefault().DownloadRevisionAsync(chromiumRevision);
10+
await Downloader.CreateDefault().DownloadAsync(chromiumRevision);
1111
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
1212
{
1313
Headless = true
14-
}, chromiumRevision);
14+
});
1515
var page = await browser.NewPageAsync();
1616
await page.GoToAsync("http://www.google.com");
1717
await page.ScreenshotAsync(outputFile);
@@ -32,11 +32,11 @@ await page.SetViewport(new ViewPortOptions
3232
## Generate PDF files
3333

3434
```cs
35-
await Downloader.CreateDefault().DownloadRevisionAsync(chromiumRevision);
35+
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
3636
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
3737
{
3838
Headless = true
39-
}, chromiumRevision);
39+
});
4040
var page = await browser.NewPageAsync();
4141
await page.GoToAsync("http://www.google.com");
4242
await page.PdfAsync(outputFile);
325 Bytes
Binary file not shown.

lib/PuppeteerSharp.Tests/BrowserTests/Events/DisconnectedTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public DisconnectedTests(ITestOutputHelper output) : base(output)
1414
[Fact]
1515
public async Task ShouldEmittedWhenBrowserGetsClosedDisconnectedOrUnderlyingWebsocketGetsClosed()
1616
{
17-
var originalBrowser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions(), TestConstants.ChromiumRevision, TestConstants.LoggerFactory);
17+
var originalBrowser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions(), TestConstants.LoggerFactory);
1818
var connectOptions = new ConnectOptions { BrowserWSEndpoint = originalBrowser.WebSocketEndpoint };
1919
var remoteBrowser1 = await Puppeteer.ConnectAsync(connectOptions, TestConstants.LoggerFactory);
2020
var remoteBrowser2 = await Puppeteer.ConnectAsync(connectOptions, TestConstants.LoggerFactory);
@@ -37,4 +37,4 @@ public async Task ShouldEmittedWhenBrowserGetsClosedDisconnectedOrUnderlyingWebs
3737
Assert.Equal(1, disconnectedRemote2);
3838
}
3939
}
40-
}
40+
}

lib/PuppeteerSharp.Tests/Issues/Issue0128.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ await Assert.ThrowsAsync<ChromeProcessException>(async () =>
1515
{
1616
var options = TestConstants.DefaultBrowserOptions();
1717
options.Args = new[] { "-remote-debugging-port=-2" };
18-
await Puppeteer.LaunchAsync(options, TestConstants.ChromiumRevision, TestConstants.LoggerFactory);
18+
await Puppeteer.LaunchAsync(options, TestConstants.LoggerFactory);
1919
});
2020
}
2121
}
22-
}
22+
}

lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public PuppeteerBrowserBaseTest(ITestOutputHelper output) : base(output)
2424

2525
protected virtual async Task InitializeAsync()
2626
{
27-
Browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions(), TestConstants.ChromiumRevision, TestConstants.LoggerFactory);
27+
Browser = await Puppeteer.LaunchAsync(TestConstants.DefaultBrowserOptions(), TestConstants.LoggerFactory);
2828
}
2929

3030
protected virtual async Task DisposeAsync() => await Browser.CloseAsync();

lib/PuppeteerSharp.Tests/PuppeteerLoaderFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void Dispose()
2121

2222
private async Task SetupAsync()
2323
{
24-
var downloaderTask = Downloader.CreateDefault().DownloadRevisionAsync(TestConstants.ChromiumRevision);
24+
var downloaderTask = new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
2525

2626
Server = SimpleServer.Create(TestConstants.Port, TestUtils.FindParentDirectory("PuppeteerSharp.TestServer"));
2727
HttpsServer = SimpleServer.CreateHttps(TestConstants.HttpsPort, TestUtils.FindParentDirectory("PuppeteerSharp.TestServer"));
@@ -32,4 +32,4 @@ private async Task SetupAsync()
3232
await Task.WhenAll(downloaderTask, serverStart, httpsServerStart);
3333
}
3434
}
35-
}
35+
}

0 commit comments

Comments
 (0)