Skip to content

Commit

Permalink
Update code so that the setcontent method also uses the page loading …
Browse files Browse the repository at this point in the history 
…logic.
  • Loading branch information
Kees committed Mar 17, 2022
1 parent 13370c3 commit bd18073
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 38 deletions.
67 changes: 34 additions & 33 deletions ChromeHtmlToPdfLib/Browser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,10 @@ internal Browser(Uri browser, ILogger logger)
/// <summary>
/// Instructs Chrome to navigate to the given <paramref name="uri" />
/// </summary>
/// <param name="uri"></param>
/// <param name="useCache">When <c>true</c> then caching will be enabled</param>
/// <param name="safeUrls">A list with URL's that are safe to load</param>
/// <param name="useCache">When <c>true</c> then caching will be enabled</param>
/// <param name="uri"></param>
/// <param name="html"></param>
/// <param name="countdownTimer">If a <see cref="CountdownTimer"/> is set then
/// the method will raise an <see cref="ConversionTimedOutException"/> if the
/// <see cref="CountdownTimer"/> reaches zero before finishing navigation</param>
Expand All @@ -135,9 +136,10 @@ internal Browser(Uri browser, ILogger logger)
/// <exception cref="ChromeException">Raised when an error is returned by Chrome</exception>
/// <exception cref="ConversionTimedOutException">Raised when <paramref name="countdownTimer"/> reaches zero</exception>
internal void NavigateTo(
Uri uri,
List<string> safeUrls,
bool useCache,
Uri uri = null,
string html = null,
CountdownTimer countdownTimer = null,
int? mediaLoadTimeout = null,
List<string> urlBlacklist = null,
Expand All @@ -148,7 +150,7 @@ internal Browser(Uri browser, ILogger logger)
var navigationError = string.Empty;
var waitForNetworkIdle = false;
var mediaTimeoutTaskSet = false;
var absoluteUri = uri.AbsoluteUri.Substring(0, uri.AbsoluteUri.LastIndexOf('/') + 1);
var absoluteUri = uri?.AbsoluteUri.Substring(0, uri.AbsoluteUri.LastIndexOf('/') + 1);

#region Message handler
var messageHandler = new EventHandler<string>(delegate(object sender, string data)
Expand Down Expand Up @@ -207,7 +209,8 @@ internal Browser(Uri browser, ILogger logger)
var requestId = fetch.Params.RequestId;
var url = fetch.Params.Request.Url;
var isSafeUrl = safeUrls.Contains(url);
var isAbsoluteFileUri = url.StartsWith("file://", StringComparison.InvariantCultureIgnoreCase) &&
var isAbsoluteFileUri = absoluteUri != null &&
url.StartsWith("file://", StringComparison.InvariantCultureIgnoreCase) &&
url.StartsWith(absoluteUri, StringComparison.InvariantCultureIgnoreCase);

if (!RegularExpression.IsRegExMatch(urlBlacklist, url, out var matchedPattern) || isAbsoluteFileUri || isSafeUrl)
Expand All @@ -234,7 +237,7 @@ internal Browser(Uri browser, ILogger logger)
// ConnectionAborted, ConnectionFailed, NameNotResolved, InternetDisconnected, AddressUnreachable,
// BlockedByClient, BlockedByResponse
fetchFail.Parameters.Add("errorReason", "BlockedByClient");
_pageConnection.SendAsync(fetchFail);
_pageConnection.Send(fetchFail);
}

break;
Expand Down Expand Up @@ -334,10 +337,31 @@ internal Browser(Uri browser, ILogger logger)
lifecycleEventEnabledMessage.AddParameter("enabled", true);
_pageConnection.Send(lifecycleEventEnabledMessage);

// Navigates current page to the given URL
var pageNavigateMessage = new Message {Method = "Page.navigate"};
pageNavigateMessage.AddParameter("url", uri.ToString());
_pageConnection.Send(pageNavigateMessage);
if (uri != null)
{
// Navigates current page to the given URL
var pageNavigateMessage = new Message { Method = "Page.navigate" };
pageNavigateMessage.AddParameter("url", uri.ToString());
_pageConnection.Send(pageNavigateMessage);
}
else if (!string.IsNullOrWhiteSpace(html))
{
WriteToLog("Getting page frame tree");
var pageGetFrameTree = new Message { Method = "Page.getFrameTree" };
var frameTree = _pageConnection.SendAsync(pageGetFrameTree).GetAwaiter().GetResult();
var frameResult = Protocol.Page.FrameTree.FromJson(frameTree);

WriteToLog("Setting document content");

var pageSetDocumentContent = new Message { Method = "Page.setDocumentContent" };
pageSetDocumentContent.AddParameter("frameId", frameResult.Result.FrameTree.Frame.Id);
pageSetDocumentContent.AddParameter("html", html);
_pageConnection.Send(pageSetDocumentContent);

WriteToLog("Document content set");
}
else
throw new ArgumentException("Uri and html are both null");

if (countdownTimer != null)
{
Expand Down Expand Up @@ -388,29 +412,6 @@ internal Browser(Uri browser, ILogger logger)
}
#endregion

#region SetPageContent
/// <summary>
/// Sets given markup as the document's HTML
/// </summary>
/// <param name="html">HTML content to set</param>
internal void SetDocumentContent(string html)
{
WriteToLog("Getting page frame tree");
var pageGetFrameTree = new Message {Method = "Page.getFrameTree"};
var frameTree = _pageConnection.SendAsync(pageGetFrameTree).GetAwaiter().GetResult();
var frameResult = Protocol.Page.FrameTree.FromJson(frameTree);

WriteToLog("Setting document content");

var pageSetDocumentContent = new Message {Method = "Page.setDocumentContent"};
pageSetDocumentContent.AddParameter("frameId", frameResult.Result.FrameTree.Frame.Id);
pageSetDocumentContent.AddParameter("html", html);
_pageConnection.Send(pageSetDocumentContent);

WriteToLog("Document content set");
}
#endregion

#region WaitForWindowStatus
/// <summary>
/// Wait until the javascript window.status is returning the given <paramref name="status" />
Expand Down
7 changes: 2 additions & 5 deletions ChromeHtmlToPdfLib/Converter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,12 +1193,9 @@ public void SetUrlBlacklist(IList<string> urls)
}

if (inputUri != null)
{
WriteToLog($"Loading {(inputUri.IsFile ? $"file {inputUri.OriginalString}" : $"url {inputUri}")}");
_browser.NavigateTo(inputUri, safeUrls, _useCache, countdownTimer, mediaLoadTimeout, _urlBlacklist, LogNetworkTraffic);
}
else
_browser.SetDocumentContent(html);

_browser.NavigateTo(safeUrls, _useCache, inputUri, html, countdownTimer, mediaLoadTimeout, _urlBlacklist, LogNetworkTraffic);

if (!string.IsNullOrWhiteSpace(waitForWindowStatus))
{
Expand Down

0 comments on commit bd18073

Please sign in to comment.