github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-24 18:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prerendering imposes its own (overridable) timeout with descriptive error

Browse Source
This commit is contained in:
SteveSandersonMS
2016-09-08 12:56:05 +01:00
parent 411100478a
commit 4ca1669db1
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
View File

@@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
private const string PrerenderExportAttributeName = "asp-prerender-export";
private const string PrerenderWebpackConfigAttributeName = "asp-prerender-webpack-config";
private const string PrerenderDataAttributeName = "asp-prerender-data";
private const string PrerenderTimeoutAttributeName = "asp-prerender-timeout";
private static INodeServices _fallbackNodeServices; // Used only if no INodeServices was registered with DI
private readonly string _applicationBasePath;
@@ -50,6 +51,9 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
[HtmlAttributeName(PrerenderDataAttributeName)]
public object CustomDataParameter { get; set; }
[HtmlAttributeName(PrerenderTimeoutAttributeName)]
public int TimeoutMillisecondsParameter { get; set; }
[HtmlAttributeNotBound]
[ViewContext]
public ViewContext ViewContext { get; set; }
@@ -79,7 +83,8 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
},
unencodedAbsoluteUrl,
unencodedPathAndQuery,
CustomDataParameter);
CustomDataParameter,
TimeoutMillisecondsParameter);
output.Content.SetHtmlContent(result.Html);
// Also attach any specified globals to the 'window' object. This is useful for transferring

6
src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
View File

@@ -23,7 +23,8 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
JavaScriptModuleExport bootModule,
string requestAbsoluteUrl,
string requestPathAndQuery,
object customDataParameter)
object customDataParameter,
int timeoutMilliseconds)
{
return nodeServices.InvokeExportAsync<RenderToStringResult>(
NodeScript.Value.FileName,
@@ -32,7 +33,8 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
bootModule,
requestAbsoluteUrl,
requestPathAndQuery,
customDataParameter);
customDataParameter,
timeoutMilliseconds);
}
}
}